diff --git a/lib/messages/commands/addr.js b/lib/messages/commands/addr.js index 3428476..5144cdd 100644 --- a/lib/messages/commands/addr.js +++ b/lib/messages/commands/addr.js @@ -29,10 +29,6 @@ function AddrMessage(options) { } inherits(AddrMessage, Message); -AddrMessage.fromObject = function(options) { - return new AddrMessage(options); -}; - AddrMessage.fromBuffer = function(payload) { var parser = new BufferReader(payload); @@ -50,7 +46,7 @@ AddrMessage.fromBuffer = function(payload) { } utils.checkFinished(parser); - return AddrMessage.fromObject(obj); + return new AddrMessage(obj); }; AddrMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/alert.js b/lib/messages/commands/alert.js index 48ebf00..03130a3 100644 --- a/lib/messages/commands/alert.js +++ b/lib/messages/commands/alert.js @@ -32,17 +32,13 @@ function AlertMessage(options) { } inherits(AlertMessage, Message); -AlertMessage.fromObject = function(options) { - return new AlertMessage(options); -}; - AlertMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); obj.payload = parser.readVarLengthBuffer(); obj.signature = parser.readVarLengthBuffer(); utils.checkFinished(parser); - return AlertMessage.fromObject(obj); + return new AlertMessage(obj); }; AlertMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/block.js b/lib/messages/commands/block.js index 1c27d0b..bdd3d2b 100644 --- a/lib/messages/commands/block.js +++ b/lib/messages/commands/block.js @@ -35,13 +35,9 @@ function BlockMessage(options) { } inherits(BlockMessage, Message); -BlockMessage.fromObject = function(options) { - return new BlockMessage(options); -}; - BlockMessage.fromBuffer = function(payload) { var block = Block.fromBuffer(payload); - return BlockMessage.fromObject({block: block}); + return new BlockMessage({block: block}); }; BlockMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/filteradd.js b/lib/messages/commands/filteradd.js index c9349df..ac76682 100644 --- a/lib/messages/commands/filteradd.js +++ b/lib/messages/commands/filteradd.js @@ -32,17 +32,13 @@ function FilteraddMessage(options) { } inherits(FilteraddMessage, Message); -FilteraddMessage.fromObject = function(options) { - return new FilteraddMessage(options); -}; - FilteraddMessage.fromBuffer = function(payload) { var obj = {}; $.checkArgument(payload); var parser = new BufferReader(payload); obj.data = parser.readVarLengthBuffer(); utils.checkFinished(parser); - return FilteraddMessage.fromObject(obj); + return new FilteraddMessage(obj); }; FilteraddMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/filterclear.js b/lib/messages/commands/filterclear.js index ba39028..0682e06 100644 --- a/lib/messages/commands/filterclear.js +++ b/lib/messages/commands/filterclear.js @@ -25,12 +25,8 @@ function FilterclearMessage(options) { } inherits(FilterclearMessage, Message); -FilterclearMessage.fromObject = function(options) { - return new FilterclearMessage(options); -}; - FilterclearMessage.fromBuffer = function(payload) { - return FilterclearMessage.fromObject({}); + return new FilterclearMessage({}); }; FilterclearMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/filterload.js b/lib/messages/commands/filterload.js index 4c3e9da..0c4cab7 100644 --- a/lib/messages/commands/filterload.js +++ b/lib/messages/commands/filterload.js @@ -32,14 +32,10 @@ function FilterloadMessage(options) { } inherits(FilterloadMessage, Message); -FilterloadMessage.fromObject = function(options) { - return new FilterloadMessage(options); -}; - FilterloadMessage.fromBuffer = function(payload) { var obj = {}; obj.filter = BloomFilter.fromBuffer(payload); - return FilterloadMessage.fromObject(obj); + return new FilterloadMessage(obj); }; FilterloadMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/getaddr.js b/lib/messages/commands/getaddr.js index 6bed5d5..e139d76 100644 --- a/lib/messages/commands/getaddr.js +++ b/lib/messages/commands/getaddr.js @@ -25,13 +25,8 @@ function GetaddrMessage(options) { } inherits(GetaddrMessage, Message); -GetaddrMessage.fromObject = function(options) { - return new GetaddrMessage(options); -}; - GetaddrMessage.fromBuffer = function() { - var obj = {}; - return GetaddrMessage.fromObject(obj); + return new GetaddrMessage({}); }; GetaddrMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/getblocks.js b/lib/messages/commands/getblocks.js index 7b0dcc4..76fd462 100644 --- a/lib/messages/commands/getblocks.js +++ b/lib/messages/commands/getblocks.js @@ -37,10 +37,6 @@ function GetblocksMessage(options) { } inherits(GetblocksMessage, Message); -GetblocksMessage.fromObject = function(obj) { - return new GetblocksMessage(obj); -}; - GetblocksMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); @@ -55,7 +51,7 @@ GetblocksMessage.fromBuffer = function(payload) { } obj.stop = parser.read(32); utils.checkFinished(parser); - return GetblocksMessage.fromObject(obj); + return new GetblocksMessage(obj); }; GetblocksMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/getdata.js b/lib/messages/commands/getdata.js index 9dfeb49..6bb3ce6 100644 --- a/lib/messages/commands/getdata.js +++ b/lib/messages/commands/getdata.js @@ -64,10 +64,6 @@ GetdataMessage.forFilteredBlock = function(hash) { return new GetdataMessage([Inventory.forFilteredBlock(hash)]); }; -GetdataMessage.fromObject = function(options) { - return new GetdataMessage(options); -}; - GetdataMessage.fromBuffer = function(payload) { var obj = { inventory: [] @@ -82,7 +78,7 @@ GetdataMessage.fromBuffer = function(payload) { } utils.checkFinished(parser); - return GetdataMessage.fromObject(obj); + return new GetdataMessage(obj); }; GetdataMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/getheaders.js b/lib/messages/commands/getheaders.js index fb154d6..ec1be4b 100644 --- a/lib/messages/commands/getheaders.js +++ b/lib/messages/commands/getheaders.js @@ -37,10 +37,6 @@ function GetheadersMessage(options) { } inherits(GetheadersMessage, Message); -GetheadersMessage.fromObject = function(obj) { - return new GetheadersMessage(obj); -}; - GetheadersMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); @@ -55,7 +51,7 @@ GetheadersMessage.fromBuffer = function(payload) { } obj.stop = parser.read(32); utils.checkFinished(parser); - return GetheadersMessage.fromObject(obj); + return new GetheadersMessage(obj); }; GetheadersMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/headers.js b/lib/messages/commands/headers.js index ce9dfcf..785c01c 100644 --- a/lib/messages/commands/headers.js +++ b/lib/messages/commands/headers.js @@ -31,10 +31,6 @@ function HeadersMessage(options) { } inherits(HeadersMessage, Message); -HeadersMessage.fromObject = function(options) { - return new HeadersMessage(options); -}; - HeadersMessage.fromBuffer = function(payload) { var obj = {}; @@ -51,7 +47,7 @@ HeadersMessage.fromBuffer = function(payload) { } utils.checkFinished(parser); - return HeadersMessage.fromObject(obj); + return new HeadersMessage(obj); }; HeadersMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/inv.js b/lib/messages/commands/inv.js index 730a637..200e9cf 100644 --- a/lib/messages/commands/inv.js +++ b/lib/messages/commands/inv.js @@ -63,10 +63,6 @@ InvMessage.forFilteredBlock = function(hash) { return new InvMessage([Inventory.forFilteredBlock(hash)]); }; -InvMessage.fromObject = function(options) { - return new InvMessage(options); -}; - InvMessage.prototype.getPayload = function() { var bw = new BufferWriter(); utils.writeInventory(this.inventory, bw); @@ -87,7 +83,7 @@ InvMessage.fromBuffer = function(payload) { } utils.checkFinished(parser); - return InvMessage.fromObject(obj); + return new InvMessage(obj); }; module.exports = function(options) { diff --git a/lib/messages/commands/mempool.js b/lib/messages/commands/mempool.js index d6f85db..e18c28b 100644 --- a/lib/messages/commands/mempool.js +++ b/lib/messages/commands/mempool.js @@ -27,12 +27,8 @@ function MempoolMessage(options) { } inherits(MempoolMessage, Message); -MempoolMessage.fromObject = function(options) { - return new MempoolMessage(options); -}; - MempoolMessage.fromBuffer = function(payload) { - return MempoolMessage.fromObject({}); + return new MempoolMessage({}); }; MempoolMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/merkleblock.js b/lib/messages/commands/merkleblock.js index 114a839..486cb95 100644 --- a/lib/messages/commands/merkleblock.js +++ b/lib/messages/commands/merkleblock.js @@ -34,15 +34,11 @@ function MerkleblockMessage(options) { } inherits(MerkleblockMessage, Message); -MerkleblockMessage.fromObject = function(options) { - return new MerkleblockMessage(options); -}; - MerkleblockMessage.fromBuffer = function(payload) { var obj = {}; $.checkArgument(BufferUtil.isBuffer(payload)); obj.merkleBlock = MerkleBlock.fromBuffer(payload); - return MerkleblockMessage.fromObject(obj); + return new MerkleblockMessage(obj); }; MerkleblockMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/notfound.js b/lib/messages/commands/notfound.js index 5b96e16..2860dca 100644 --- a/lib/messages/commands/notfound.js +++ b/lib/messages/commands/notfound.js @@ -63,10 +63,6 @@ NotfoundMessage.forFilteredBlock = function(hash) { return new NotfoundMessage([Inventory.forFilteredBlock(hash)]); }; -NotfoundMessage.fromObject = function(options) { - return new NotfoundMessage(options); -}; - NotfoundMessage.fromBuffer = function(payload) { var obj = { inventory: [] @@ -81,7 +77,7 @@ NotfoundMessage.fromBuffer = function(payload) { } utils.checkFinished(parser); - return NotfoundMessage.fromObject(obj); + return new NotfoundMessage(obj); }; NotfoundMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/ping.js b/lib/messages/commands/ping.js index c762346..77c2ff6 100644 --- a/lib/messages/commands/ping.js +++ b/lib/messages/commands/ping.js @@ -33,17 +33,13 @@ PingMessage.prototype.getPayload = function() { return this.nonce; }; -PingMessage.fromObject = function(obj) { - return new PingMessage(obj); -}; - PingMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); obj.nonce = parser.read(8); utils.checkFinished(parser); - return PingMessage.fromObject(obj); + return new PingMessage(obj); }; module.exports = function(options) { diff --git a/lib/messages/commands/pong.js b/lib/messages/commands/pong.js index da7cea7..69ab964 100644 --- a/lib/messages/commands/pong.js +++ b/lib/messages/commands/pong.js @@ -29,17 +29,13 @@ function PongMessage(options) { } inherits(PongMessage, Message); -PongMessage.fromObject = function(obj) { - return new PongMessage(obj); -}; - PongMessage.fromBuffer = function(payload) { var obj = {}; var parser = new BufferReader(payload); obj.nonce = parser.read(8); utils.checkFinished(parser); - return PongMessage.fromObject(obj); + return new PongMessage(obj); }; PongMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/reject.js b/lib/messages/commands/reject.js index 47aebb3..0a47038 100644 --- a/lib/messages/commands/reject.js +++ b/lib/messages/commands/reject.js @@ -21,13 +21,9 @@ function RejectMessage(options) { } inherits(RejectMessage, Message); -RejectMessage.fromObject = function(options) { - return new RejectMessage(options); -}; - RejectMessage.fromBuffer = function(payload) { var obj = {}; - return RejectMessage.fromObject(obj); + return new RejectMessage(obj); }; RejectMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/tx.js b/lib/messages/commands/tx.js index a5931a5..e203417 100644 --- a/lib/messages/commands/tx.js +++ b/lib/messages/commands/tx.js @@ -35,10 +35,6 @@ function TransactionMessage(options) { } inherits(TransactionMessage, Message); -TransactionMessage.fromObject = function(options) { - return new TransactionMessage(options); -}; - TransactionMessage.fromBuffer = function(payload) { var transaction; if (Transaction.prototype.fromBuffer) { @@ -46,7 +42,7 @@ TransactionMessage.fromBuffer = function(payload) { } else { transaction = Transaction.fromBuffer(payload); } - return TransactionMessage.fromObject({transaction: transaction}); + return new TransactionMessage({transaction: transaction}); }; TransactionMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/verack.js b/lib/messages/commands/verack.js index 86e8695..6eef05b 100644 --- a/lib/messages/commands/verack.js +++ b/lib/messages/commands/verack.js @@ -25,12 +25,8 @@ function VerackMessage(options) { } inherits(VerackMessage, Message); -VerackMessage.fromObject = function(obj) { - return new VerackMessage(obj); -}; - VerackMessage.fromBuffer = function(payload) { - return VerackMessage.fromObject({}); + return new VerackMessage({}); }; VerackMessage.prototype.getPayload = function() { diff --git a/lib/messages/commands/version.js b/lib/messages/commands/version.js index e4487b1..0c9627d 100644 --- a/lib/messages/commands/version.js +++ b/lib/messages/commands/version.js @@ -46,10 +46,6 @@ function VersionMessage(obj) { } inherits(VersionMessage, Message); -VersionMessage.fromObject = function(obj) { - return new VersionMessage(obj); -}; - VersionMessage.fromBuffer = function(payload) { var parser = new BufferReader(payload); var obj = {}; @@ -78,7 +74,7 @@ VersionMessage.fromBuffer = function(payload) { } utils.checkFinished(parser); - return VersionMessage.fromObject(obj); + return new VersionMessage(obj); }; VersionMessage.prototype.getPayload = function() { diff --git a/test/messages/builder.js b/test/messages/builder.js index 86798df..4bd1094 100644 --- a/test/messages/builder.js +++ b/test/messages/builder.js @@ -63,7 +63,7 @@ describe('Messages Builder', function() { it('#relay setting works', function() { [true,false].forEach(function(relay) { - var message = b.commands.version.fromObject({relay: relay}); + var message = new b.commands.version({relay: relay}); message.relay.should.equal(relay); var messageBuf = message.getPayload(); var newMessage = b.commands.version.fromBuffer(messageBuf);