lukechilds
/
bitcoincashjs
mirror of https://github.com/lukechilds/bitcoincashjs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

make tests pass with Script refactor

patch-2
Manuel Araoz 10 years ago
parent
87f6651554
commit
66e96e5fa4
7 changed files with 70 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      lib/script.js
  2. 6
      lib/txin.js
  3. 6
      lib/txout.js
  4. 4
      test/address.js
  5. 109
      test/script.js
  6. 2
      test/txin.js
  7. 6
      test/txout.js

17
lib/script.js
View File

@ -12,9 +12,9 @@ var Script = function Script(from) {
this.chunks = [];
if (Buffer.isBuffer(from)) {
this.fromBuffer(from);
return Script.fromBuffer(from);
} else if (typeof from === 'string') {
this.fromString(from);
return Script.fromString(from);
} else if (typeof from !== 'undefined') {
this.set(from);
}
@ -103,8 +103,9 @@ Script.prototype.toBuffer = function() {
return bw.concat();
};
Script.prototype.fromString = function(str) {
this.chunks = [];
Script.fromString = function(str) {
var script = new Script();
script.chunks = [];
var tokens = str.split(' ');
var i = 0;
@ -116,7 +117,7 @@ Script.prototype.fromString = function(str) {
if (typeof opcodenum === 'undefined') {
opcodenum = parseInt(token);
if (opcodenum > 0 && opcodenum < Opcode.map.OP_PUSHDATA1) {
this.chunks.push({
script.chunks.push({
buf: new Buffer(tokens[i + 1].slice(2), 'hex'),
len: opcodenum,
opcodenum: opcodenum
@ -129,18 +130,18 @@ Script.prototype.fromString = function(str) {
if (tokens[i + 2].slice(0, 2) !== '0x') {
throw new Error('Pushdata data must start with 0x');
}
this.chunks.push({
script.chunks.push({
buf: new Buffer(tokens[i + 2].slice(2), 'hex'),
len: parseInt(tokens[i + 1]),
opcodenum: opcodenum
});
i = i + 3;
} else {
this.chunks.push(opcodenum);
script.chunks.push(opcodenum);
i = i + 1;
}
}
return this;
return script;
};
Script.prototype.toString = function() {

6
lib/txin.js
View File

@ -36,7 +36,7 @@ Txin.prototype.fromJSON = function(json) {
txidbuf: new Buffer(json.txidbuf, 'hex'),
txoutnum: json.txoutnum,
scriptvi: Varint().fromJSON(json.scriptvi),
script: Script().fromJSON(json.script),
script: Script.fromString(json.script),
seqnum: json.seqnum
});
return this;
@ -47,7 +47,7 @@ Txin.prototype.toJSON = function() {
txidbuf: this.txidbuf.toString('hex'),
txoutnum: this.txoutnum,
scriptvi: this.scriptvi.toJSON(),
script: this.script.toJSON(),
script: this.script.toString(),
seqnum: this.seqnum
};
};
@ -60,7 +60,7 @@ Txin.prototype.fromBufferReader = function(br) {
this.txidbuf = br.read(32);
this.txoutnum = br.readUInt32LE();
this.scriptvi = Varint(br.readVarintBuf());
this.script = Script().fromBuffer(br.read(this.scriptvi.toNumber()));
this.script = Script.fromBuffer(br.read(this.scriptvi.toNumber()));
this.seqnum = br.readUInt32LE();
return this;
};

6
lib/txout.js
View File

@ -32,7 +32,7 @@ Txout.prototype.fromJSON = function(json) {
this.set({
valuebn: BN().fromJSON(json.valuebn),
scriptvi: Varint().fromJSON(json.scriptvi),
script: Script().fromJSON(json.script)
script: Script.fromString(json.script)
});
return this;
};
@ -41,7 +41,7 @@ Txout.prototype.toJSON = function() {
return {
valuebn: this.valuebn.toJSON(),
scriptvi: this.scriptvi.toJSON(),
script: this.script.toJSON()
script: this.script.toString()
};
};
@ -52,7 +52,7 @@ Txout.prototype.fromBuffer = function(buf) {
Txout.prototype.fromBufferReader = function(br) {
this.valuebn = br.readUInt64LEBN();
this.scriptvi = Varint(br.readVarintNum());
this.script = Script().fromBuffer(br.read(this.scriptvi.toNumber()));
this.script = Script.fromBuffer(br.read(this.scriptvi.toNumber()));
return this;
};

4
test/address.js
View File

@ -294,7 +294,7 @@ describe('Address', function() {
});
it('should make this address from a script', function() {
var s = Script().fromString("OP_CHECKMULTISIG");
var s = Script.fromString("OP_CHECKMULTISIG");
var buf = s.toBuffer();
var a = Address.fromScript(s);
a.toString().should.equal('3BYmEwgV2vANrmfRymr1mFnHXgLjD6gAWm');
@ -305,7 +305,7 @@ describe('Address', function() {
});
it('should make this address from other script', function() {
var s = Script().fromString("OP_CHECKSIG OP_HASH160");
var s = Script.fromString("OP_CHECKSIG OP_HASH160");
var a = Address.fromScript(s);
a.toString().should.equal('347iRqVwks5r493N1rsLN4k9J7Ljg488W7');
var b = new Address(s);

109
test/script.js
View File

@ -17,7 +17,7 @@ describe('Script', function() {
it('should parse this buffer containing an OP code', function() {
var buf = new Buffer(1);
buf[0] = Opcode('OP_0').toNumber();
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].should.equal(buf[0]);
});
@ -25,14 +25,14 @@ describe('Script', function() {
it('should parse this buffer containing another OP code', function() {
var buf = new Buffer(1);
buf[0] = Opcode('OP_CHECKMULTISIG').toNumber();
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].should.equal(buf[0]);
});
it('should parse this buffer containing three bytes of data', function() {
var buf = new Buffer([3, 1, 2, 3]);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
});
@ -41,7 +41,7 @@ describe('Script', function() {
var buf = new Buffer([0, 0, 1, 2, 3]);
buf[0] = Opcode('OP_PUSHDATA1').toNumber();
buf.writeUInt8(3, 1);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
});
@ -50,7 +50,7 @@ describe('Script', function() {
var buf = new Buffer([0, 0, 0, 1, 2, 3]);
buf[0] = Opcode('OP_PUSHDATA2').toNumber();
buf.writeUInt16LE(3, 1);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
});
@ -59,7 +59,7 @@ describe('Script', function() {
var buf = new Buffer([0, 0, 0, 0, 0, 1, 2, 3]);
buf[0] = Opcode('OP_PUSHDATA4').toNumber();
buf.writeUInt16LE(3, 1);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
});
@ -70,7 +70,7 @@ describe('Script', function() {
buf[1] = Opcode('OP_PUSHDATA4').toNumber();
buf.writeUInt16LE(3, 2);
buf[buf.length - 1] = Opcode('OP_0').toNumber();
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(3);
script.chunks[0].should.equal(buf[0]);
script.chunks[1].buf.toString('hex').should.equal('010203');
@ -84,7 +84,7 @@ describe('Script', function() {
it('should output this buffer containing an OP code', function() {
var buf = new Buffer(1);
buf[0] = Opcode('OP_0').toNumber();
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].should.equal(buf[0]);
script.toBuffer().toString('hex').should.equal(buf.toString('hex'));
@ -93,7 +93,7 @@ describe('Script', function() {
it('should output this buffer containing another OP code', function() {
var buf = new Buffer(1);
buf[0] = Opcode('OP_CHECKMULTISIG').toNumber();
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].should.equal(buf[0]);
script.toBuffer().toString('hex').should.equal(buf.toString('hex'));
@ -101,7 +101,7 @@ describe('Script', function() {
it('should output this buffer containing three bytes of data', function() {
var buf = new Buffer([3, 1, 2, 3]);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
script.toBuffer().toString('hex').should.equal(buf.toString('hex'));
@ -111,7 +111,7 @@ describe('Script', function() {
var buf = new Buffer([0, 0, 1, 2, 3]);
buf[0] = Opcode('OP_PUSHDATA1').toNumber();
buf.writeUInt8(3, 1);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
script.toBuffer().toString('hex').should.equal(buf.toString('hex'));
@ -121,7 +121,7 @@ describe('Script', function() {
var buf = new Buffer([0, 0, 0, 1, 2, 3]);
buf[0] = Opcode('OP_PUSHDATA2').toNumber();
buf.writeUInt16LE(3, 1);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
script.toBuffer().toString('hex').should.equal(buf.toString('hex'));
@ -131,7 +131,7 @@ describe('Script', function() {
var buf = new Buffer([0, 0, 0, 0, 0, 1, 2, 3]);
buf[0] = Opcode('OP_PUSHDATA4').toNumber();
buf.writeUInt16LE(3, 1);
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(1);
script.chunks[0].buf.toString('hex').should.equal('010203');
script.toBuffer().toString('hex').should.equal(buf.toString('hex'));
@ -143,7 +143,7 @@ describe('Script', function() {
buf[1] = Opcode('OP_PUSHDATA4').toNumber();
buf.writeUInt16LE(3, 2);
buf[buf.length - 1] = Opcode('OP_0').toNumber();
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(3);
script.chunks[0].should.equal(buf[0]);
script.chunks[1].buf.toString('hex').should.equal('010203');
@ -156,10 +156,10 @@ describe('Script', function() {
describe('#fromString', function() {
it('should parse these known scripts', function() {
Script().fromString('OP_0 OP_PUSHDATA4 3 0x010203 OP_0').toString().should.equal('OP_0 OP_PUSHDATA4 3 0x010203 OP_0');
Script().fromString('OP_0 OP_PUSHDATA2 3 0x010203 OP_0').toString().should.equal('OP_0 OP_PUSHDATA2 3 0x010203 OP_0');
Script().fromString('OP_0 OP_PUSHDATA1 3 0x010203 OP_0').toString().should.equal('OP_0 OP_PUSHDATA1 3 0x010203 OP_0');
Script().fromString('OP_0 3 0x010203 OP_0').toString().should.equal('OP_0 3 0x010203 OP_0');
Script.fromString('OP_0 OP_PUSHDATA4 3 0x010203 OP_0').toString().should.equal('OP_0 OP_PUSHDATA4 3 0x010203 OP_0');
Script.fromString('OP_0 OP_PUSHDATA2 3 0x010203 OP_0').toString().should.equal('OP_0 OP_PUSHDATA2 3 0x010203 OP_0');
Script.fromString('OP_0 OP_PUSHDATA1 3 0x010203 OP_0').toString().should.equal('OP_0 OP_PUSHDATA1 3 0x010203 OP_0');
Script.fromString('OP_0 3 0x010203 OP_0').toString().should.equal('OP_0 3 0x010203 OP_0');
});
});
@ -172,7 +172,7 @@ describe('Script', function() {
buf[1] = Opcode('OP_PUSHDATA4').toNumber();
buf.writeUInt16LE(3, 2);
buf[buf.length - 1] = Opcode('OP_0').toNumber();
var script = Script().fromBuffer(buf);
var script = Script.fromBuffer(buf);
script.chunks.length.should.equal(3);
script.chunks[0].should.equal(buf[0]);
script.chunks[1].buf.toString('hex').should.equal('010203');
@ -182,22 +182,6 @@ describe('Script', function() {
});
describe('#fromJSON', function() {
it('should parse this known script', function() {
Script().fromJSON('OP_0 OP_PUSHDATA4 3 0x010203 OP_0').toString().should.equal('OP_0 OP_PUSHDATA4 3 0x010203 OP_0');
});
});
describe('#toJSON', function() {
it('should output this known script', function() {
Script().fromString('OP_0 OP_PUSHDATA4 3 0x010203 OP_0').toJSON().should.equal('OP_0 OP_PUSHDATA4 3 0x010203 OP_0');
});
});
describe('#isOpReturn', function() {
it('should know this is a (blank) OP_RETURN script', function() {
@ -267,44 +251,37 @@ describe('Script', function() {
});
describe('#writeOp', function() {
describe('#add', function() {
it('should write these ops', function() {
Script().writeOp('OP_CHECKMULTISIG').toString().should.equal('OP_CHECKMULTISIG');
Script().writeOp(Opcode.map.OP_CHECKMULTISIG).toString().should.equal('OP_CHECKMULTISIG');
it('should add these ops', function() {
Script().add('OP_CHECKMULTISIG').toString().should.equal('OP_CHECKMULTISIG');
Script().add(Opcode.map.OP_CHECKMULTISIG).toString().should.equal('OP_CHECKMULTISIG');
});
});
describe('#writeBuffer', function() {
it('should write these push data', function() {
var buf = new Buffer(1);
buf.fill(0);
Script().writeBuffer(buf).toString().should.equal('1 0x00');
buf = new Buffer(255);
buf.fill(0);
Script().writeBuffer(buf).toString().should.equal('OP_PUSHDATA1 255 0x' + buf.toString('hex'));
buf = new Buffer(256);
buf.fill(0);
Script().writeBuffer(buf).toString().should.equal('OP_PUSHDATA2 256 0x' + buf.toString('hex'));
buf = new Buffer(Math.pow(2, 16));
buf.fill(0);
Script().writeBuffer(buf).toString().should.equal('OP_PUSHDATA4 ' + Math.pow(2, 16) + ' 0x' + buf.toString('hex'));
});
it('should add these push data', function() {
var buf = new Buffer(1);
buf.fill(0);
Script().add(buf).toString().should.equal('1 0x00');
buf = new Buffer(255);
buf.fill(0);
Script().add(buf).toString().should.equal('OP_PUSHDATA1 255 0x' + buf.toString('hex'));
buf = new Buffer(256);
buf.fill(0);
Script().add(buf).toString().should.equal('OP_PUSHDATA2 256 0x' + buf.toString('hex'));
buf = new Buffer(Math.pow(2, 16));
buf.fill(0);
Script().add(buf).toString().should.equal('OP_PUSHDATA4 ' + Math.pow(2, 16) + ' 0x' + buf.toString('hex'));
});
describe('#write', function() {
it('should write both pushdata and non-pushdata chunks', function() {
Script().write('OP_CHECKMULTISIG').toString().should.equal('OP_CHECKMULTISIG');
Script().write(Opcode.map.OP_CHECKMULTISIG).toString().should.equal('OP_CHECKMULTISIG');
var buf = new Buffer(1);
buf.fill(0);
Script().write(buf).toString().should.equal('1 0x00');
});
it('should add both pushdata and non-pushdata chunks', function() {
Script().add('OP_CHECKMULTISIG').toString().should.equal('OP_CHECKMULTISIG');
Script().add(Opcode.map.OP_CHECKMULTISIG).toString().should.equal('OP_CHECKMULTISIG');
var buf = new Buffer(1);
buf.fill(0);
Script().add(buf).toString().should.equal('1 0x00');
});
});

2
test/txin.js
View File

@ -12,7 +12,7 @@ describe('Txin', function() {
var txidbuf = new Buffer(32);
txidbuf.fill(0);
var txoutnum = 0;
var script = Script().fromString('OP_CHECKMULTISIG');
var script = Script.fromString('OP_CHECKMULTISIG');
var scriptvi = Varint(script.toBuffer().length);
var seqnum = 0;
var txin = Txin().set({

6
test/txout.js
View File

@ -11,7 +11,7 @@ var Script = bitcore.Script;
describe('Txout', function() {
var valuebn = BN(5);
var script = Script().fromString('OP_CHECKMULTISIG');
var script = Script.fromString('OP_CHECKMULTISIG');
var scriptvi = Varint(script.toBuffer().length);
it('should make a new txout', function() {
@ -43,7 +43,7 @@ describe('Txout', function() {
var txout = Txout().fromJSON({
valuebn: valuebn.toJSON(),
scriptvi: scriptvi.toJSON(),
script: script.toJSON()
script: script.toString()
});
should.exist(txout.valuebn);
should.exist(txout.scriptvi);
@ -58,7 +58,7 @@ describe('Txout', function() {
var txout = Txout().fromJSON({
valuebn: valuebn.toJSON(),
scriptvi: scriptvi.toJSON(),
script: script.toJSON()
script: script.toString()
});
var json = txout.toJSON();
should.exist(json.valuebn);

Write Preview
Loading…
Cancel
Save