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

varint -> vi canonical spelling

patch-2
Ryan X. Charles 10 years ago
parent
4a21a9551c
commit
cf5b2f1250
6 changed files with 42 additions and 42 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. 24
      lib/transaction.js
  2. 14
      lib/txin.js
  3. 14
      lib/txout.js
  4. 12
      test/transaction.js
  5. 12
      test/txin.js
  6. 8
      test/txout.js

24
lib/transaction.js
View File

@ -4,15 +4,15 @@ var BufferWriter = require('./bufferwriter');
var BufferReader = require('./bufferreader');
var Varint = require('./varint');
var Transaction = function Transaction(version, txinsvarint, txins, txoutsvarint, txouts, nlocktime) {
var Transaction = function Transaction(version, txinsvi, txins, txoutsvi, txouts, nlocktime) {
if (!(this instanceof Transaction))
return new Transaction(version, txinsvarint, txins, txoutsvarint, txouts, nlocktime);
return new Transaction(version, txinsvi, txins, txoutsvi, txouts, nlocktime);
if (typeof version === 'number') {
this.set({
version: version,
txinsvarint: txinsvarint,
txinsvi: txinsvi,
txins: txins,
txoutsvarint: txoutsvarint,
txoutsvi: txoutsvi,
txouts: txouts,
nlocktime: nlocktime
});
@ -24,9 +24,9 @@ var Transaction = function Transaction(version, txinsvarint, txins, txoutsvarint
Transaction.prototype.set = function(obj) {
this.version = typeof obj.version !== 'undefined' ? obj.version : this.version;
this.txinsvarint = obj.txinsvarint || this.txinsvarint;
this.txinsvi = obj.txinsvi || this.txinsvi;
this.txins = obj.txins || this.txins;
this.txoutsvarint = obj.txoutsvarint || this.txoutsvarint;
this.txoutsvi = obj.txoutsvi || this.txoutsvi;
this.txouts = obj.txouts || this.txouts;
this.nlocktime = typeof obj.nlocktime !== 'undefined' ? obj.nlocktime : this.nlocktime;
return this;
@ -38,14 +38,14 @@ Transaction.prototype.fromBuffer = function(buf) {
Transaction.prototype.fromBufferReader = function(br) {
this.version = br.readUInt32LE();
this.txinsvarint = Varint(br.readVarintBuf());
var txinsnum = this.txinsvarint.toNumber();
this.txinsvi = Varint(br.readVarintBuf());
var txinsnum = this.txinsvi.toNumber();
this.txins = [];
for (var i = 0; i < txinsnum; i++) {
this.txins.push(Txin().fromBufferReader(br));
}
this.txoutsvarint = Varint(br.readVarintBuf());
var txoutsnum = this.txoutsvarint.toNumber();
this.txoutsvi = Varint(br.readVarintBuf());
var txoutsnum = this.txoutsvi.toNumber();
this.txouts = [];
for (var i = 0; i < txoutsnum; i++) {
this.txouts.push(Txout().fromBufferReader(br));
@ -62,11 +62,11 @@ Transaction.prototype.toBufferWriter = function(bw) {
if (!bw)
bw = new BufferWriter();
bw.writeUInt32LE(this.version);
bw.write(this.txinsvarint.buf);
bw.write(this.txinsvi.buf);
for (var i = 0; i < this.txins.length; i++) {
this.txins[i].toBufferWriter(bw);
}
bw.write(this.txoutsvarint.buf)
bw.write(this.txoutsvi.buf)
for (var i = 0; i < this.txouts.length; i++) {
this.txouts[i].toBufferWriter(bw);
}

14
lib/txin.js
View File

@ -3,13 +3,13 @@ var BufferWriter = require('./bufferwriter');
var Varint = require('./varint');
var Script = require('./script');
var Txin = function Txin(txidbuf, txoutnum, varint, script, seqnum) {
var Txin = function Txin(txidbuf, txoutnum, scriptvi, script, seqnum) {
if (!(this instanceof Txin))
return new Txin(txidbuf, txoutnum, varint, script, seqnum);
return new Txin(txidbuf, txoutnum, scriptvi, script, seqnum);
if (Buffer.isBuffer(txidbuf)) {
this.txidbuf = txidbuf;
this.txoutnum = txoutnum;
this.varint = varint;
this.scriptvi = scriptvi;
this.script = script;
this.seqnum = seqnum;
} else if (txidbuf) {
@ -21,7 +21,7 @@ var Txin = function Txin(txidbuf, txoutnum, varint, script, seqnum) {
Txin.prototype.set = function(obj) {
this.txidbuf = obj.txidbuf || this.txidbuf;
this.txoutnum = typeof obj.txoutnum !== 'undefined' ? obj.txoutnum : this.txoutnum;
this.varint = typeof obj.varint !== 'undefined' ? obj.varint : this.varint;
this.scriptvi = typeof obj.scriptvi !== 'undefined' ? obj.scriptvi : this.scriptvi;
this.script = obj.script || this.script;
this.seqnum = typeof obj.seqnum !== 'undefined' ? obj.seqnum : this.seqnum;
return this;
@ -34,8 +34,8 @@ Txin.prototype.fromBuffer = function(buf) {
Txin.prototype.fromBufferReader = function(br) {
this.txidbuf = br.read(32);
this.txoutnum = br.readUInt32LE();
this.varint = Varint(br.readVarintBuf());
this.script = Script().fromBuffer(br.read(this.varint.toNumber()));
this.scriptvi = Varint(br.readVarintBuf());
this.script = Script().fromBuffer(br.read(this.scriptvi.toNumber()));
this.seqnum = br.readUInt32LE();
return this;
};
@ -49,7 +49,7 @@ Txin.prototype.toBufferWriter = function(bw) {
bw = new BufferWriter();
bw.write(this.txidbuf);
bw.writeUInt32LE(this.txoutnum);
bw.write(this.varint.buf);
bw.write(this.scriptvi.buf);
bw.write(this.script.toBuffer());
bw.writeUInt32LE(this.seqnum);
return bw;

14
lib/txout.js
View File

@ -4,13 +4,13 @@ var BufferWriter = require('./bufferwriter');
var Varint = require('./varint');
var Script = require('./script');
var Txout = function Txout(valuebn, varint, script) {
var Txout = function Txout(valuebn, scriptvi, script) {
if (!(this instanceof Txout))
return new Txout(valuebn, varint, script);
return new Txout(valuebn, scriptvi, script);
if (valuebn instanceof BN) {
this.set({
valuebn: valuebn,
varint: varint,
scriptvi: scriptvi,
script: script
});
} else if (valuebn) {
@ -21,7 +21,7 @@ var Txout = function Txout(valuebn, varint, script) {
Txout.prototype.set = function(obj) {
this.valuebn = obj.valuebn || this.valuebn;
this.varint = obj.varint || this.varint;
this.scriptvi = obj.scriptvi || this.scriptvi;
this.script = obj.script || this.script;
return this;
};
@ -32,8 +32,8 @@ Txout.prototype.fromBuffer = function(buf) {
Txout.prototype.fromBufferReader = function(br) {
this.valuebn = br.readUInt64LEBN();
this.varint = Varint(br.readVarintNum());
this.script = Script().fromBuffer(br.read(this.varint.toNumber()));
this.scriptvi = Varint(br.readVarintNum());
this.script = Script().fromBuffer(br.read(this.scriptvi.toNumber()));
return this;
};
@ -46,7 +46,7 @@ Txout.prototype.toBufferWriter = function(bw) {
if (!bw)
bw = new BufferWriter();
bw.writeUInt64LEBN(this.valuebn);
bw.write(this.varint.buf);
bw.write(this.scriptvi.buf);
bw.write(this.script.toBuffer());
return bw;
};

12
test/transaction.js
View File

@ -19,9 +19,9 @@ describe('Transaction', function() {
var txout = Txout().fromBuffer(new Buffer('050000000000000001ae', 'hex'));
var tx = Transaction().set({
version: 0,
txinsvarint: Varint(1),
txinsvi: Varint(1),
txins: [txin],
txoutsvarint: Varint(1),
txoutsvi: Varint(1),
txouts: [txout],
nlocktime: 0
});
@ -37,16 +37,16 @@ describe('Transaction', function() {
it('should set all the basic parameters', function() {
var tx = Transaction().set({
version: 0,
txinsvarint: Varint(1),
txinsvi: Varint(1),
txins: [txin],
txoutsvarint: Varint(1),
txoutsvi: Varint(1),
txouts: [txout],
nlocktime: 0
});
should.exist(tx.version);
should.exist(tx.txinsvarint);
should.exist(tx.txinsvi);
should.exist(tx.txins);
should.exist(tx.txoutsvarint);
should.exist(tx.txoutsvi);
should.exist(tx.txouts);
should.exist(tx.nlocktime);
});

12
test/txin.js
View File

@ -17,12 +17,12 @@ describe('Txin', function() {
txidbuf.fill(0);
var txoutnum = 0;
var script = Script().fromString("OP_CHECKMULTISIG");
var varint = Varint(script.toBuffer().length);
var scriptvi = Varint(script.toBuffer().length);
var seqnum = 0;
var txin = Txin().set({
txidbuf: txidbuf,
txoutnum: txoutnum,
varint: varint,
scriptvi: scriptvi,
script: script,
seqnum: seqnum
});
@ -33,13 +33,13 @@ describe('Txin', function() {
var txin = Txin().set({
txidbuf: txidbuf,
txoutnum: txoutnum,
varint: varint,
scriptvi: scriptvi,
script: script,
seqnum: seqnum
});
should.exist(txin.txidbuf);
should.exist(txin.txoutnum);
should.exist(txin.varint);
should.exist(txin.scriptvi);
should.exist(txin.script);
should.exist(txin.seqnum);
});
@ -52,7 +52,7 @@ describe('Txin', function() {
var hex = '00000000000000000000000000000000000000000000000000000000000000000000000001ae00000000';
var buf = new Buffer(hex, 'hex');
var txin = Txin().fromBuffer(buf);
txin.varint.toNumber().should.equal(1);
txin.scriptvi.toNumber().should.equal(1);
txin.script.toString().should.equal('OP_CHECKMULTISIG');
});
@ -65,7 +65,7 @@ describe('Txin', function() {
var buf = new Buffer(hex, 'hex');
var br = BufferReader(buf);
var txin = Txin().fromBufferReader(br);
txin.varint.toNumber().should.equal(1);
txin.scriptvi.toNumber().should.equal(1);
txin.script.toString().should.equal('OP_CHECKMULTISIG');
});

8
test/txout.js
View File

@ -17,10 +17,10 @@ describe('Txout', function() {
var valuebn = BN(5);
var script = Script().fromString("OP_CHECKMULTISIG");
var varint = Varint(script.toBuffer().length);
var scriptvi = Varint(script.toBuffer().length);
var txout = new Txout().set({
valuebn: valuebn,
varint: varint,
scriptvi: scriptvi,
script: script
});
@ -29,11 +29,11 @@ describe('Txout', function() {
it('should set this object', function() {
var txout = new Txout().set({
valuebn: valuebn,
varint: varint,
scriptvi: scriptvi,
script: script
});
should.exist(txout.valuebn);
should.exist(txout.varint);
should.exist(txout.scriptvi);
should.exist(txout.script);
});

Write Preview
Loading…
Cancel
Save