Skip to content

Commit

Permalink
fix Buffer.concat use
Browse files Browse the repository at this point in the history
  • Loading branch information
maraoz committed Feb 18, 2014
1 parent 4da3285 commit e0233f0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Block.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ function spec(b) {
var i2 = Math.min(i + 1, size - 1);
var a = tree[j + i];
var b = tree[j + i2];
tree.push(util.twoSha256(buffertools.concat(a,b)));
tree.push(util.twoSha256(Buffer.concat([a,b])));
}
j += size;
}
Expand Down
2 changes: 1 addition & 1 deletion Script.js
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ function spec(b) {
Script.prototype.writeBytes = function (data)
{
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);
};

Expand Down
2 changes: 1 addition & 1 deletion ScriptInterpreter.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ function spec(b) {
v2 = this.stackTop(1);
this.stackPop();
this.stackPop();
this.stack.push(buffertools.concat(v1, v2));
this.stack.push(Buffer.concat([v1, v2]));
break;

case OP_SUBSTR:
Expand Down
10 changes: 5 additions & 5 deletions Transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function spec(b) {
var VerificationError = error.VerificationError;
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) {
if ("object" !== typeof data) {
Expand All @@ -44,7 +44,7 @@ function spec(b) {
var qbuf = new Buffer(4);
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() {
Expand Down Expand Up @@ -88,7 +88,7 @@ function spec(b) {

TransactionOut.prototype.serialize = function serialize() {
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) {
Expand Down Expand Up @@ -537,7 +537,7 @@ function spec(b) {
var buffer = bytes.buffer();

// 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);
};
Expand Down Expand Up @@ -612,7 +612,7 @@ function spec(b) {
var voutBuf = new Buffer(4);
voutBuf.writeUInt32LE(vout, 0);

txin.o = buffertools.concat(hash, voutBuf);
txin.o = Buffer.concat([hash, voutBuf]);

txobj.ins.push(txin);
});
Expand Down
2 changes: 1 addition & 1 deletion util/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ var varIntBuf = exports.varIntBuf = function varIntBuf(n) {
};

var varStrBuf = exports.varStrBuf = function varStrBuf(s) {
return buffertools.concat(varIntBuf(s.length), s);
return Buffer.concat([varIntBuf(s.length), s]);
};

// Initializations
Expand Down

0 comments on commit e0233f0

Please sign in to comment.