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

fix Buffer.concat use

Browse Source
This commit is contained in:
Manuel Araoz 2014-02-18 16:03:29 -03:00
parent 4da3285930
commit e0233f02dd
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Block.js
View File

@ -182,7 +182,7 @@ function spec(b) {
var i2 = Math.min(i + 1, size - 1); var i2 = Math.min(i + 1, size - 1);
var a = tree[j + i]; var a = tree[j + i];
var b = tree[j + i2]; var b = tree[j + i2];
tree.push(util.twoSha256(buffertools.concat(a,b))); tree.push(util.twoSha256(Buffer.concat([a,b])));
} }
j += size; j += size;
} }

2
Script.js
View File

@ -382,7 +382,7 @@ function spec(b) {
Script.prototype.writeBytes = function (data) Script.prototype.writeBytes = function (data)
{ {
var newSize = this.buffer.length + prefixSize(data.length) + data.length; var newSize = this.buffer.length + prefixSize(data.length) + data.length;
this.buffer = buffertools.concat(this.buffer, encodeLen(data.length), data); this.buffer = Buffer.concat([this.buffer, encodeLen(data.length), data]);
this.chunks.push(data); this.chunks.push(data);
}; };

2
ScriptInterpreter.js
View File

@ -303,7 +303,7 @@ function spec(b) {
v2 = this.stackTop(1); v2 = this.stackTop(1);
this.stackPop(); this.stackPop();
this.stackPop(); this.stackPop();
this.stack.push(buffertools.concat(v1, v2)); this.stack.push(Buffer.concat([v1, v2]));
break; break;
case OP_SUBSTR: case OP_SUBSTR:

10
Transaction.js
View File

@ -17,7 +17,7 @@ function spec(b) {
var VerificationError = error.VerificationError; var VerificationError = error.VerificationError;
var MissingSourceError = error.MissingSourceError; var MissingSourceError = error.MissingSourceError;
var COINBASE_OP = buffertools.concat(util.NULL_HASH, new Buffer('FFFFFFFF', 'hex')); var COINBASE_OP = Buffer.concat([util.NULL_HASH, new Buffer('FFFFFFFF', 'hex')]);
function TransactionIn(data) { function TransactionIn(data) {
if ("object" !== typeof data) { if ("object" !== typeof data) {
@ -44,7 +44,7 @@ function spec(b) {
var qbuf = new Buffer(4); var qbuf = new Buffer(4);
qbuf.writeUInt32LE(this.q, 0); qbuf.writeUInt32LE(this.q, 0);
return buffertools.concat(this.o, slen, this.s, qbuf); return Buffer.concat([this.o, slen, this.s, qbuf]);
}; };
TransactionIn.prototype.getOutpointHash = function getOutpointHash() { TransactionIn.prototype.getOutpointHash = function getOutpointHash() {
@ -88,7 +88,7 @@ function spec(b) {
TransactionOut.prototype.serialize = function serialize() { TransactionOut.prototype.serialize = function serialize() {
var slen = util.varIntBuf(this.s.length); var slen = util.varIntBuf(this.s.length);
return buffertools.concat(his.v, slen, this.s); return Buffer.concat([his.v, slen, this.s]);
}; };
function Transaction(data) { function Transaction(data) {
@ -537,7 +537,7 @@ function spec(b) {
var buffer = bytes.buffer(); var buffer = bytes.buffer();
// Append hashType // Append hashType
buffer = buffertools.concat(buffer, new Buffer([parseInt(hashType), 0, 0, 0])); buffer = Buffer.concat([buffer, new Buffer([parseInt(hashType), 0, 0, 0])]);
return util.twoSha256(buffer); return util.twoSha256(buffer);
}; };
@ -612,7 +612,7 @@ function spec(b) {
var voutBuf = new Buffer(4); var voutBuf = new Buffer(4);
voutBuf.writeUInt32LE(vout, 0); voutBuf.writeUInt32LE(vout, 0);
txin.o = buffertools.concat(hash, voutBuf); txin.o = Buffer.concat([hash, voutBuf]);
txobj.ins.push(txin); txobj.ins.push(txin);
}); });

2
util/util.js
View File

@ -320,7 +320,7 @@ var varIntBuf = exports.varIntBuf = function varIntBuf(n) {
}; };
var varStrBuf = exports.varStrBuf = function varStrBuf(s) { var varStrBuf = exports.varStrBuf = function varStrBuf(s) {
return buffertools.concat(varIntBuf(s.length), s); return Buffer.concat([varIntBuf(s.length), s]);
}; };
// Initializations // Initializations