LBRYCommunity/bitcoinjs-lib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #163 from dcousens/wordass

Browse source 
Enforces convert.wordsToBytes to only allow for byte input
This commit is contained in:
Wei Lu 2014-04-30 08:49:05 +08:00
commit 39516d5532
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/convert.js
View file

@ -1,3 +1,4 @@
var assert = require('assert')
var Crypto = require('crypto-js')
var WordArray = Crypto.lib.WordArray
@ -77,6 +78,7 @@ function varIntToNum(bytes) {
}
function bytesToWords(bytes) {
assert(Array.isArray(bytes) || Buffer.isBuffer(bytes), 'Input must be a byte array')
var words = []
for (var i = 0, b = 0; i < bytes.length; i++, b += 8) {
words[b >>> 5] |= bytes[i] << (24 - b % 32)

12
test/hdwallet.js
View file

@ -233,17 +233,17 @@ describe('HDWallet', function() {
describe('network types', function() {
it('ensures that a bitcoin Wallet generates bitcoin addresses', function() {
var wallet = new HDWallet('foobar', 'bitcoin')
assert.equal(wallet.getAddress().toString(), '1JNymexJHEr5u1BndiChMStFkCgPm4EQ6o')
var wallet = new HDWallet(new Buffer('foobar'), 'bitcoin')
assert.equal(wallet.getAddress().toString(), '17SnB9hyGwJPoKpLb9eVPHjsujyEuBpMAA')
})
it('ensures that a testnet Wallet generates testnet addresses', function() {
var wallet = new HDWallet('foobar', 'testnet')
assert.equal(wallet.getAddress().toString(), 'mxtw4i3H6GHLg7fQMHB5BN6acCH6kQ7aoY')
var wallet = new HDWallet(new Buffer('foobar'), 'testnet')
assert.equal(wallet.getAddress().toString(), 'mmxjUCnx5xjeaSHxJicsDCxCmjZwq8KTbv')
})
it('throws an excption when unknown network type is passed in', function() {
assert.throws(function() { new HDWallet("foobar", "doge") })
it('throws an exception when unknown network type is passed in', function() {
assert.throws(function() { new HDWallet(new Buffer('foobar'), 'doge') })
})
})
})