Skip to content

Commit

Permalink
Removed bufferput dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
Braydon Fuller committed Mar 12, 2015
1 parent 11bee8b commit 32a28b1
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 24 deletions.
41 changes: 18 additions & 23 deletions lib/messages/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var BN = bitcore.crypto.BN;
var BufferReader = bitcore.encoding.BufferReader;
var BufferWriter = bitcore.encoding.BufferWriter;
var BufferUtil = bitcore.util.buffer;
var Put = require('bufferput'); //todo remove
var $ = bitcore.util.preconditions;
var _ = bitcore.deps._;

Expand Down Expand Up @@ -437,18 +436,14 @@ function builder(options) {
};

commands.headers.prototype.getPayload = function() {
var put = new Put();
put.varint(this.headers.length);

var bw = new BufferWriter();
bw.writeVarintNum(this.headers.length);
for (var i = 0; i < this.headers.length; i++) {
var buffer = this
.headers[i]
.toBuffer();
put.put(buffer);
put.varint(0);
var buffer = this.headers[i].toBuffer();
bw.write(buffer);
bw.writeUInt8(0);
}

return put.buffer();
return bw.concat();
};

/* notfound */
Expand Down Expand Up @@ -601,14 +596,14 @@ function builder(options) {
};

commands.alert.prototype.getPayload = function() {
var put = new Put();
put.varint(this.payload.length);
put.put(this.payload);
var bw = new BufferWriter();
bw.writeVarintNum(this.payload.length);
bw.write(this.payload);

put.varint(this.signature.length);
put.put(this.signature);
bw.writeVarintNum(this.signature.length);
bw.write(this.signature);

return put.buffer();
return bw.concat();
};

/* reject */
Expand Down Expand Up @@ -849,17 +844,17 @@ function builder(options) {
};

commands.getheaders.prototype.getPayload = function() {
var put = new Put();
put.word32le(this.version);
put.varint(this.starts.length);
var bw = new BufferWriter();
bw.writeUInt32LE(this.version);
bw.writeVarintNum(this.starts.length);
for (var i = 0; i < this.starts.length; i++) {
put.put(this.starts[i]);
bw.write(this.starts[i]);
}
if (this.stop.length !== 32) {
throw new Error('Invalid hash length: ' + this.stop.length);
}
put.put(this.stop);
return put.buffer();
bw.write(this.stop);
return bw.concat();
};

/* mempool */
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
"dependencies": {
"bitcore": "^0.11.0",
"bloom-filter": "^0.1.1",
"bufferput": "^0.1.2",
"buffers": "^0.1.1",
"socks5-client": "^0.3.6"
},
Expand Down

0 comments on commit 32a28b1

Please sign in to comment.