Removed bufferput dependency

This commit is contained in:
Braydon Fuller 2015-03-11 23:53:21 -04:00
parent 11bee8b900
commit 32a28b133a
2 changed files with 18 additions and 24 deletions

View File

@ -9,7 +9,6 @@ var BN = bitcore.crypto.BN;
var BufferReader = bitcore.encoding.BufferReader; var BufferReader = bitcore.encoding.BufferReader;
var BufferWriter = bitcore.encoding.BufferWriter; var BufferWriter = bitcore.encoding.BufferWriter;
var BufferUtil = bitcore.util.buffer; var BufferUtil = bitcore.util.buffer;
var Put = require('bufferput'); //todo remove
var $ = bitcore.util.preconditions; var $ = bitcore.util.preconditions;
var _ = bitcore.deps._; var _ = bitcore.deps._;
@ -437,18 +436,14 @@ function builder(options) {
}; };
commands.headers.prototype.getPayload = function() { commands.headers.prototype.getPayload = function() {
var put = new Put(); var bw = new BufferWriter();
put.varint(this.headers.length); bw.writeVarintNum(this.headers.length);
for (var i = 0; i < this.headers.length; i++) { for (var i = 0; i < this.headers.length; i++) {
var buffer = this var buffer = this.headers[i].toBuffer();
.headers[i] bw.write(buffer);
.toBuffer(); bw.writeUInt8(0);
put.put(buffer);
put.varint(0);
} }
return bw.concat();
return put.buffer();
}; };
/* notfound */ /* notfound */
@ -601,14 +596,14 @@ function builder(options) {
}; };
commands.alert.prototype.getPayload = function() { commands.alert.prototype.getPayload = function() {
var put = new Put(); var bw = new BufferWriter();
put.varint(this.payload.length); bw.writeVarintNum(this.payload.length);
put.put(this.payload); bw.write(this.payload);
put.varint(this.signature.length); bw.writeVarintNum(this.signature.length);
put.put(this.signature); bw.write(this.signature);
return put.buffer(); return bw.concat();
}; };
/* reject */ /* reject */
@ -849,17 +844,17 @@ function builder(options) {
}; };
commands.getheaders.prototype.getPayload = function() { commands.getheaders.prototype.getPayload = function() {
var put = new Put(); var bw = new BufferWriter();
put.word32le(this.version); bw.writeUInt32LE(this.version);
put.varint(this.starts.length); bw.writeVarintNum(this.starts.length);
for (var i = 0; i < this.starts.length; i++) { for (var i = 0; i < this.starts.length; i++) {
put.put(this.starts[i]); bw.write(this.starts[i]);
} }
if (this.stop.length !== 32) { if (this.stop.length !== 32) {
throw new Error('Invalid hash length: ' + this.stop.length); throw new Error('Invalid hash length: ' + this.stop.length);
} }
put.put(this.stop); bw.write(this.stop);
return put.buffer(); return bw.concat();
}; };
/* mempool */ /* mempool */

View File

@ -54,7 +54,6 @@
"dependencies": { "dependencies": {
"bitcore": "^0.11.0", "bitcore": "^0.11.0",
"bloom-filter": "^0.1.1", "bloom-filter": "^0.1.1",
"bufferput": "^0.1.2",
"buffers": "^0.1.1", "buffers": "^0.1.1",
"socks5-client": "^0.3.6" "socks5-client": "^0.3.6"
}, },