diff --git a/lib/messages/commands/addr.js b/lib/messages/commands/addr.js index 7afa47c..ed86b99 100644 --- a/lib/messages/commands/addr.js +++ b/lib/messages/commands/addr.js @@ -17,7 +17,7 @@ var BufferWriter = bitcore.encoding.BufferWriter; * @constructor */ function AddrMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'addr'; this.magicNumber = options.magicNumber; $.checkArgument( diff --git a/lib/messages/commands/alert.js b/lib/messages/commands/alert.js index 021fa41..28c12e1 100644 --- a/lib/messages/commands/alert.js +++ b/lib/messages/commands/alert.js @@ -17,7 +17,7 @@ var BufferWriter = bitcore.encoding.BufferWriter; * @constructor */ function AlertMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'alert'; if (!arg) { diff --git a/lib/messages/commands/block.js b/lib/messages/commands/block.js index 76fe212..9bcf9db 100644 --- a/lib/messages/commands/block.js +++ b/lib/messages/commands/block.js @@ -15,7 +15,7 @@ var _ = bitcore.deps._; * @constructor */ function BlockMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.Block = options.Block; this.command = 'block'; this.magicNumber = options.magicNumber; diff --git a/lib/messages/commands/filteradd.js b/lib/messages/commands/filteradd.js index 4237924..7cd82e1 100644 --- a/lib/messages/commands/filteradd.js +++ b/lib/messages/commands/filteradd.js @@ -19,7 +19,7 @@ var _ = bitcore.deps._; * @constructor */ function FilteraddMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'filteradd'; $.checkArgument( diff --git a/lib/messages/commands/filterclear.js b/lib/messages/commands/filterclear.js index 95c0e02..017ba20 100644 --- a/lib/messages/commands/filterclear.js +++ b/lib/messages/commands/filterclear.js @@ -12,7 +12,7 @@ var BufferUtil = bitcore.util.buffer; * @constructor */ function FilterclearMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'filterclear'; } diff --git a/lib/messages/commands/filterload.js b/lib/messages/commands/filterload.js index 6ed0159..63465e9 100644 --- a/lib/messages/commands/filterload.js +++ b/lib/messages/commands/filterload.js @@ -17,7 +17,7 @@ var _ = bitcore.deps._; * @constructor */ function FilterloadMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'filterload'; $.checkArgument( diff --git a/lib/messages/commands/getaddr.js b/lib/messages/commands/getaddr.js index 55d93a5..2beca5d 100644 --- a/lib/messages/commands/getaddr.js +++ b/lib/messages/commands/getaddr.js @@ -13,7 +13,7 @@ var BufferUtil = bitcore.util.buffer; * @constructor */ function GetaddrMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'getaddr'; } diff --git a/lib/messages/commands/getblocks.js b/lib/messages/commands/getblocks.js index eb7599d..771c5b2 100644 --- a/lib/messages/commands/getblocks.js +++ b/lib/messages/commands/getblocks.js @@ -21,7 +21,7 @@ var $ = bitcore.util.preconditions; * @constructor */ function GetblocksMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'getblocks'; this.version = options.protocolVersion; this.magicNumber = options.magicNumber; diff --git a/lib/messages/commands/getdata.js b/lib/messages/commands/getdata.js index dd0680b..cd9b7ef 100644 --- a/lib/messages/commands/getdata.js +++ b/lib/messages/commands/getdata.js @@ -16,7 +16,7 @@ var _ = bitcore.deps._; * @constructor */ function GetdataMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'getdata'; this.magicNumber = options.magicNumber; utils.checkInventory(arg); diff --git a/lib/messages/commands/getheaders.js b/lib/messages/commands/getheaders.js index 0dc933c..19b96bd 100644 --- a/lib/messages/commands/getheaders.js +++ b/lib/messages/commands/getheaders.js @@ -20,7 +20,7 @@ var $ = bitcore.util.preconditions; * @constructor */ function GetheadersMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'getheaders'; this.version = options.protocolVersion; this.magicNumber = options.magicNumber; diff --git a/lib/messages/commands/headers.js b/lib/messages/commands/headers.js index 14d600e..4fd1688 100644 --- a/lib/messages/commands/headers.js +++ b/lib/messages/commands/headers.js @@ -21,7 +21,7 @@ var $ = bitcore.util.preconditions; * @constructor */ function HeadersMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.BlockHeader = options.BlockHeader; this.magicNumber = options.magicNumber; this.command = 'headers'; diff --git a/lib/messages/commands/inv.js b/lib/messages/commands/inv.js index 0823584..073354b 100644 --- a/lib/messages/commands/inv.js +++ b/lib/messages/commands/inv.js @@ -17,7 +17,7 @@ var _ = bitcore.deps._; * @constructor */ function InvMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'inv'; this.magicNumber = options.magicNumber; utils.checkInventory(arg); diff --git a/lib/messages/commands/mempool.js b/lib/messages/commands/mempool.js index e70e4e5..00fad39 100644 --- a/lib/messages/commands/mempool.js +++ b/lib/messages/commands/mempool.js @@ -15,7 +15,7 @@ var BufferUtil = bitcore.util.buffer; * @constructor */ function MempoolMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'mempool'; } diff --git a/lib/messages/commands/merkleblock.js b/lib/messages/commands/merkleblock.js index f5856c9..e26f405 100644 --- a/lib/messages/commands/merkleblock.js +++ b/lib/messages/commands/merkleblock.js @@ -18,7 +18,7 @@ var _ = bitcore.deps._; * @constructor */ function MerkleblockMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.MerkleBlock = options.MerkleBlock; // constructor this.magicNumber = options.magicNumber; this.command = 'merkleblock'; diff --git a/lib/messages/commands/notfound.js b/lib/messages/commands/notfound.js index fb2dd59..a8c9f03 100644 --- a/lib/messages/commands/notfound.js +++ b/lib/messages/commands/notfound.js @@ -17,7 +17,7 @@ var _ = bitcore.deps._; * @constructor */ function NotfoundMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'notfound'; this.magicNumber = options.magicNumber; utils.checkInventory(arg); diff --git a/lib/messages/commands/ping.js b/lib/messages/commands/ping.js index 8fa5703..92ba3f3 100644 --- a/lib/messages/commands/ping.js +++ b/lib/messages/commands/ping.js @@ -18,7 +18,7 @@ var BufferReader = bitcore.encoding.BufferReader; * @constructor */ function PingMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'ping'; this.magicNumber = options.magicNumber; $.checkArgument( diff --git a/lib/messages/commands/pong.js b/lib/messages/commands/pong.js index 5b248f5..111c4cc 100644 --- a/lib/messages/commands/pong.js +++ b/lib/messages/commands/pong.js @@ -18,7 +18,7 @@ var BufferReader = bitcore.encoding.BufferReader; * @constructor */ function PongMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'pong'; this.magicNumber = options.magicNumber; $.checkArgument( diff --git a/lib/messages/commands/reject.js b/lib/messages/commands/reject.js index 363e6bc..ab73e36 100644 --- a/lib/messages/commands/reject.js +++ b/lib/messages/commands/reject.js @@ -7,7 +7,7 @@ var BufferUtil = bitcore.util.buffer; // todo: add payload: https://en.bitcoin.it/wiki/Protocol_documentation#reject function RejectMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'reject'; } diff --git a/lib/messages/commands/tx.js b/lib/messages/commands/tx.js index 6dbd04f..614c42b 100644 --- a/lib/messages/commands/tx.js +++ b/lib/messages/commands/tx.js @@ -14,7 +14,7 @@ var _ = bitcore.deps._; * @constructor */ function TransactionMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.command = 'tx'; this.magicNumber = options.magicNumber; this.Transaction = options.Transaction; diff --git a/lib/messages/commands/verack.js b/lib/messages/commands/verack.js index a33f91a..5c19751 100644 --- a/lib/messages/commands/verack.js +++ b/lib/messages/commands/verack.js @@ -12,7 +12,7 @@ var BufferUtil = bitcore.util.buffer; * @constructor */ function VerackMessage(arg, options) { - Message.call(this, arg, options); + Message.call(this, options); this.magicNumber = options.magicNumber; this.command = 'verack'; } diff --git a/lib/messages/commands/version.js b/lib/messages/commands/version.js index dc8ec9c..11dc5ad 100644 --- a/lib/messages/commands/version.js +++ b/lib/messages/commands/version.js @@ -32,7 +32,7 @@ function VersionMessage(arg, options) { if (!arg) { arg = {}; } - Message.call(this, arg, options); + Message.call(this, options); this.command = 'version'; this.magicNumber = options.magicNumber; this.version = arg.version || options.protocolVersion; diff --git a/lib/messages/message.js b/lib/messages/message.js index 341d4ed..4165914 100644 --- a/lib/messages/message.js +++ b/lib/messages/message.js @@ -12,7 +12,7 @@ var Hash = bitcore.crypto.Hash; * @param {Number=} options.magicNumber * @constructor */ -function Message(arg, options) { +function Message(options) { this.command = options.command; this.magicNumber = options.magicNumber; } diff --git a/test/messages/message.js b/test/messages/message.js index 419071b..f93b0fd 100644 --- a/test/messages/message.js +++ b/test/messages/message.js @@ -8,7 +8,7 @@ describe('Message', function() { describe('@constructor', function() { it('construct with magic number and command', function() { - var message = new Message(null, {magicNumber: 0xd9b4bef9, command: 'command'}); + var message = new Message({magicNumber: 0xd9b4bef9, command: 'command'}); message.command.should.equal('command'); message.magicNumber.should.equal(0xd9b4bef9); }); @@ -16,7 +16,7 @@ describe('Message', function() { describe('#toBuffer', function() { it('serialize to a buffer', function() { - var message = new Message(null, {magicNumber: 0xd9b4bef9, command: 'command'}); + var message = new Message({magicNumber: 0xd9b4bef9, command: 'command'}); message.getPayload = function() { return new Buffer(0); };