replace ECKey/ECPubKey with ECPair
This commit is contained in:
parent
31832293dd
commit
4c8b0f38ea
20 changed files with 266 additions and 670 deletions
test
|
@ -2,12 +2,11 @@
|
|||
|
||||
var assert = require('assert')
|
||||
var base58 = require('bs58')
|
||||
var base58check = require('bs58check')
|
||||
|
||||
var Bitcoin = require('../')
|
||||
var Address = Bitcoin.Address
|
||||
var Block = Bitcoin.Block
|
||||
var ECKey = Bitcoin.ECKey
|
||||
var ECPair = Bitcoin.ECPair
|
||||
var ECSignature = Bitcoin.ECSignature
|
||||
var Transaction = Bitcoin.Transaction
|
||||
var Script = Bitcoin.Script
|
||||
|
@ -95,32 +94,31 @@ describe('Bitcoin-core', function () {
|
|||
})
|
||||
|
||||
// base58_keys_valid
|
||||
describe('ECKey', function () {
|
||||
describe('ECPair', function () {
|
||||
base58_keys_valid.forEach(function (f) {
|
||||
var string = f[0]
|
||||
var hex = f[1]
|
||||
var params = f[2]
|
||||
var network = params.isTestnet ? networks.testnet : networks.bitcoin
|
||||
|
||||
if (!params.isPrivkey) return
|
||||
var privKey = ECKey.fromWIF(string)
|
||||
var keyPair = ECPair.fromWIF(string)
|
||||
|
||||
it('imports ' + string + ' correctly', function () {
|
||||
assert.equal(privKey.d.toHex(), hex)
|
||||
assert.equal(privKey.pub.compressed, params.isCompressed)
|
||||
assert.equal(keyPair.d.toHex(), hex)
|
||||
assert.equal(keyPair.compressed, params.isCompressed)
|
||||
})
|
||||
|
||||
it('exports ' + hex + ' to ' + string, function () {
|
||||
assert.equal(privKey.toWIF(network), string)
|
||||
assert.equal(keyPair.toWIF(), string)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// base58_keys_invalid
|
||||
describe('ECKey', function () {
|
||||
describe('ECPair', function () {
|
||||
var allowedNetworks = [
|
||||
networks.bitcoin.wif,
|
||||
networks.testnet.wif
|
||||
networks.bitcoin,
|
||||
networks.testnet
|
||||
]
|
||||
|
||||
base58_keys_invalid.forEach(function (f) {
|
||||
|
@ -128,11 +126,10 @@ describe('Bitcoin-core', function () {
|
|||
|
||||
it('throws on ' + string, function () {
|
||||
assert.throws(function () {
|
||||
ECKey.fromWIF(string)
|
||||
var version = base58check.decode(string).readUInt8(0)
|
||||
var keyPair = ECPair.fromWIF(string)
|
||||
|
||||
assert.notEqual(allowedNetworks.indexOf(version), -1, 'Invalid network')
|
||||
}, /Invalid (checksum|compression flag|network|WIF payload)/)
|
||||
assert(allowedNetworks.indexOf(keyPair.network) > -1, 'Invalid network')
|
||||
}, /(Invalid|Unknown) (checksum|compression flag|network|WIF payload)/)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue