RanchiMall/flocore
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove skipped tests since equalivant boolean tests already exist

Browse Source
This commit is contained in:
Gregg Zigler 2015-06-24 14:44:27 -04:00
parent 183ffab02b
commit 77645c7f03
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/script/script.js
View File

@ -859,11 +859,11 @@ Script.prototype._decodeOP_N = function(opcode) {
* @returns {number} number of signature operations required by this script * @returns {number} number of signature operations required by this script
*/ */
Script.prototype.getSignatureOperationsCount = function(accurate) { Script.prototype.getSignatureOperationsCount = function(accurate) {
accurate = (_.isUndefined(accurate) ? true : accurate);
var self = this; var self = this;
accurate = (typeof accurate == 'undefined') ? true : accurate;
var n = 0; var n = 0;
var lastOpcode = Opcode.OP_INVALIDOPCODE; var lastOpcode = Opcode.OP_INVALIDOPCODE;
_.each(self.chunks, function getChunkOther(chunk) { _.each(self.chunks, function getChunk(chunk) {
var opcode = chunk.opcodenum; var opcode = chunk.opcodenum;
if (opcode == Opcode.OP_CHECKSIG || opcode == Opcode.OP_CHECKSIGVERIFY) { if (opcode == Opcode.OP_CHECKSIG || opcode == Opcode.OP_CHECKSIGVERIFY) {
n++; n++;

6
test/script/script.js
View File

@ -794,9 +794,6 @@ describe('Script', function() {
Script(s1).getSignatureOperationsCount(true).should.equal(3); Script(s1).getSignatureOperationsCount(true).should.equal(3);
Script(s1).getSignatureOperationsCount(false).should.equal(21); Script(s1).getSignatureOperationsCount(false).should.equal(21);
}); });
it.skip('should handle script arg from p2sh object from string', function() {
// BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig), 3U);
});
it('should handle multi-sig-out scripts from utility function', function() { it('should handle multi-sig-out scripts from utility function', function() {
var sortKeys = pubkey_hexs.slice(0, 3).map(PublicKey); var sortKeys = pubkey_hexs.slice(0, 3).map(PublicKey);
var s2 = Script.buildMultisigOut(sortKeys, 1); var s2 = Script.buildMultisigOut(sortKeys, 1);
@ -811,9 +808,6 @@ describe('Script', function() {
p2sh.getSignatureOperationsCount(true).should.equal(0); p2sh.getSignatureOperationsCount(true).should.equal(0);
p2sh.getSignatureOperationsCount(false).should.equal(0); p2sh.getSignatureOperationsCount(false).should.equal(0);
}); });
it.skip('should handle script arg from p2sh object from utility', function() {
// BOOST_CHECK_EQUAL(p2sh.GetSigOpCount(scriptSig2), 3U);
});
it('should default the one and only argument to true', function() { it('should default the one and only argument to true', function() {
var s1 = 'OP_1 01 FF OP_2 OP_CHECKMULTISIG'; var s1 = 'OP_1 01 FF OP_2 OP_CHECKMULTISIG';
var trueCount = Script(s1).getSignatureOperationsCount(true); var trueCount = Script(s1).getSignatureOperationsCount(true);