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

Merge pull request from bitcoinjs/integration-tests

Browse source 
Integration tests
This commit is contained in:
Daniel Cousens 2014-05-14 08:56:08 +10:00
commit 1e0521f7e5
3 changed files with 9 additions and 3 deletions

4
.travis.yml
View file

@ -4,3 +4,7 @@ before_install:
node_js: node_js:
- "0.11" - "0.11"
- "0.10" - "0.10"
env:
- TEST_SUITE=unit
- TEST_SUITE=integration
script: "npm run-script $TEST_SUITE"

3
package.json
View file

@ -39,7 +39,8 @@
"files": "test/*.js" "files": "test/*.js"
}, },
"scripts": { "scripts": {
"test": "./node_modules/.bin/istanbul test ./node_modules/.bin/_mocha -- --reporter list `find test -maxdepth 1 -not -type d`", "unit": "./node_modules/.bin/istanbul test ./node_modules/.bin/_mocha -- --reporter list `find test -maxdepth 1 -not -type d`",
"test": "npm run-script unit",
"integration": "./node_modules/.bin/_mocha --reporter list test/integration/*.js", "integration": "./node_modules/.bin/_mocha --reporter list test/integration/*.js",
"coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter list test/*.js", "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter list test/*.js",
"compile": "./node_modules/.bin/browserify ./src/index.js -s Bitcoin | ./node_modules/.bin/uglifyjs > bitcoinjs-min.js" "compile": "./node_modules/.bin/browserify ./src/index.js -s Bitcoin | ./node_modules/.bin/uglifyjs > bitcoinjs-min.js"

5
test/integration/p2sh.js
View file

@ -30,7 +30,7 @@ describe('p2sh', function() {
var pubKeyBuffers = pubKeys.map(function(q) { var pubKeyBuffers = pubKeys.map(function(q) {
return q.toBuffer() return q.toBuffer()
}) })
var redeemScript = Script.createMultisigOutputScript(2, pubKeyBuffers) var redeemScript = Script.createMultisigScriptPubKey(2, pubKeyBuffers)
var hash160 = crypto.hash160(redeemScript.buffer) var hash160 = crypto.hash160(redeemScript.buffer)
var multisigAddress = new Address(hash160, networks.testnet.scriptHash) var multisigAddress = new Address(hash160, networks.testnet.scriptHash)
@ -57,7 +57,8 @@ describe('p2sh', function() {
return tx.signScriptSig(0, redeemScript, privKey) return tx.signScriptSig(0, redeemScript, privKey)
}) })
var scriptSig = Script.createP2SHMultisigScriptSig(signatures, redeemScript) var redeemScriptSig = Script.createMultisigScriptSig(signatures)
var scriptSig = Script.createP2SHScriptSig(redeemScriptSig, redeemScript)
tx.setScriptSig(0, scriptSig) tx.setScriptSig(0, scriptSig)
// Send from mutlsigAddress to targetAddress // Send from mutlsigAddress to targetAddress