removed fromObject method that is nolonger needed

This commit is contained in:
Braydon Fuller 2015-03-16 18:53:14 -04:00
parent f6e9c437d6
commit c0e3bdb190
22 changed files with 22 additions and 107 deletions

View File

@ -29,10 +29,6 @@ function AddrMessage(options) {
} }
inherits(AddrMessage, Message); inherits(AddrMessage, Message);
AddrMessage.fromObject = function(options) {
return new AddrMessage(options);
};
AddrMessage.fromBuffer = function(payload) { AddrMessage.fromBuffer = function(payload) {
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
@ -50,7 +46,7 @@ AddrMessage.fromBuffer = function(payload) {
} }
utils.checkFinished(parser); utils.checkFinished(parser);
return AddrMessage.fromObject(obj); return new AddrMessage(obj);
}; };
AddrMessage.prototype.getPayload = function() { AddrMessage.prototype.getPayload = function() {

View File

@ -32,17 +32,13 @@ function AlertMessage(options) {
} }
inherits(AlertMessage, Message); inherits(AlertMessage, Message);
AlertMessage.fromObject = function(options) {
return new AlertMessage(options);
};
AlertMessage.fromBuffer = function(payload) { AlertMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
obj.payload = parser.readVarLengthBuffer(); obj.payload = parser.readVarLengthBuffer();
obj.signature = parser.readVarLengthBuffer(); obj.signature = parser.readVarLengthBuffer();
utils.checkFinished(parser); utils.checkFinished(parser);
return AlertMessage.fromObject(obj); return new AlertMessage(obj);
}; };
AlertMessage.prototype.getPayload = function() { AlertMessage.prototype.getPayload = function() {

View File

@ -35,13 +35,9 @@ function BlockMessage(options) {
} }
inherits(BlockMessage, Message); inherits(BlockMessage, Message);
BlockMessage.fromObject = function(options) {
return new BlockMessage(options);
};
BlockMessage.fromBuffer = function(payload) { BlockMessage.fromBuffer = function(payload) {
var block = Block.fromBuffer(payload); var block = Block.fromBuffer(payload);
return BlockMessage.fromObject({block: block}); return new BlockMessage({block: block});
}; };
BlockMessage.prototype.getPayload = function() { BlockMessage.prototype.getPayload = function() {

View File

@ -32,17 +32,13 @@ function FilteraddMessage(options) {
} }
inherits(FilteraddMessage, Message); inherits(FilteraddMessage, Message);
FilteraddMessage.fromObject = function(options) {
return new FilteraddMessage(options);
};
FilteraddMessage.fromBuffer = function(payload) { FilteraddMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
$.checkArgument(payload); $.checkArgument(payload);
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
obj.data = parser.readVarLengthBuffer(); obj.data = parser.readVarLengthBuffer();
utils.checkFinished(parser); utils.checkFinished(parser);
return FilteraddMessage.fromObject(obj); return new FilteraddMessage(obj);
}; };
FilteraddMessage.prototype.getPayload = function() { FilteraddMessage.prototype.getPayload = function() {

View File

@ -25,12 +25,8 @@ function FilterclearMessage(options) {
} }
inherits(FilterclearMessage, Message); inherits(FilterclearMessage, Message);
FilterclearMessage.fromObject = function(options) {
return new FilterclearMessage(options);
};
FilterclearMessage.fromBuffer = function(payload) { FilterclearMessage.fromBuffer = function(payload) {
return FilterclearMessage.fromObject({}); return new FilterclearMessage({});
}; };
FilterclearMessage.prototype.getPayload = function() { FilterclearMessage.prototype.getPayload = function() {

View File

@ -32,14 +32,10 @@ function FilterloadMessage(options) {
} }
inherits(FilterloadMessage, Message); inherits(FilterloadMessage, Message);
FilterloadMessage.fromObject = function(options) {
return new FilterloadMessage(options);
};
FilterloadMessage.fromBuffer = function(payload) { FilterloadMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
obj.filter = BloomFilter.fromBuffer(payload); obj.filter = BloomFilter.fromBuffer(payload);
return FilterloadMessage.fromObject(obj); return new FilterloadMessage(obj);
}; };
FilterloadMessage.prototype.getPayload = function() { FilterloadMessage.prototype.getPayload = function() {

View File

@ -25,13 +25,8 @@ function GetaddrMessage(options) {
} }
inherits(GetaddrMessage, Message); inherits(GetaddrMessage, Message);
GetaddrMessage.fromObject = function(options) {
return new GetaddrMessage(options);
};
GetaddrMessage.fromBuffer = function() { GetaddrMessage.fromBuffer = function() {
var obj = {}; return new GetaddrMessage({});
return GetaddrMessage.fromObject(obj);
}; };
GetaddrMessage.prototype.getPayload = function() { GetaddrMessage.prototype.getPayload = function() {

View File

@ -37,10 +37,6 @@ function GetblocksMessage(options) {
} }
inherits(GetblocksMessage, Message); inherits(GetblocksMessage, Message);
GetblocksMessage.fromObject = function(obj) {
return new GetblocksMessage(obj);
};
GetblocksMessage.fromBuffer = function(payload) { GetblocksMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
@ -55,7 +51,7 @@ GetblocksMessage.fromBuffer = function(payload) {
} }
obj.stop = parser.read(32); obj.stop = parser.read(32);
utils.checkFinished(parser); utils.checkFinished(parser);
return GetblocksMessage.fromObject(obj); return new GetblocksMessage(obj);
}; };
GetblocksMessage.prototype.getPayload = function() { GetblocksMessage.prototype.getPayload = function() {

View File

@ -64,10 +64,6 @@ GetdataMessage.forFilteredBlock = function(hash) {
return new GetdataMessage([Inventory.forFilteredBlock(hash)]); return new GetdataMessage([Inventory.forFilteredBlock(hash)]);
}; };
GetdataMessage.fromObject = function(options) {
return new GetdataMessage(options);
};
GetdataMessage.fromBuffer = function(payload) { GetdataMessage.fromBuffer = function(payload) {
var obj = { var obj = {
inventory: [] inventory: []
@ -82,7 +78,7 @@ GetdataMessage.fromBuffer = function(payload) {
} }
utils.checkFinished(parser); utils.checkFinished(parser);
return GetdataMessage.fromObject(obj); return new GetdataMessage(obj);
}; };
GetdataMessage.prototype.getPayload = function() { GetdataMessage.prototype.getPayload = function() {

View File

@ -37,10 +37,6 @@ function GetheadersMessage(options) {
} }
inherits(GetheadersMessage, Message); inherits(GetheadersMessage, Message);
GetheadersMessage.fromObject = function(obj) {
return new GetheadersMessage(obj);
};
GetheadersMessage.fromBuffer = function(payload) { GetheadersMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
@ -55,7 +51,7 @@ GetheadersMessage.fromBuffer = function(payload) {
} }
obj.stop = parser.read(32); obj.stop = parser.read(32);
utils.checkFinished(parser); utils.checkFinished(parser);
return GetheadersMessage.fromObject(obj); return new GetheadersMessage(obj);
}; };
GetheadersMessage.prototype.getPayload = function() { GetheadersMessage.prototype.getPayload = function() {

View File

@ -31,10 +31,6 @@ function HeadersMessage(options) {
} }
inherits(HeadersMessage, Message); inherits(HeadersMessage, Message);
HeadersMessage.fromObject = function(options) {
return new HeadersMessage(options);
};
HeadersMessage.fromBuffer = function(payload) { HeadersMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
@ -51,7 +47,7 @@ HeadersMessage.fromBuffer = function(payload) {
} }
utils.checkFinished(parser); utils.checkFinished(parser);
return HeadersMessage.fromObject(obj); return new HeadersMessage(obj);
}; };
HeadersMessage.prototype.getPayload = function() { HeadersMessage.prototype.getPayload = function() {

View File

@ -63,10 +63,6 @@ InvMessage.forFilteredBlock = function(hash) {
return new InvMessage([Inventory.forFilteredBlock(hash)]); return new InvMessage([Inventory.forFilteredBlock(hash)]);
}; };
InvMessage.fromObject = function(options) {
return new InvMessage(options);
};
InvMessage.prototype.getPayload = function() { InvMessage.prototype.getPayload = function() {
var bw = new BufferWriter(); var bw = new BufferWriter();
utils.writeInventory(this.inventory, bw); utils.writeInventory(this.inventory, bw);
@ -87,7 +83,7 @@ InvMessage.fromBuffer = function(payload) {
} }
utils.checkFinished(parser); utils.checkFinished(parser);
return InvMessage.fromObject(obj); return new InvMessage(obj);
}; };
module.exports = function(options) { module.exports = function(options) {

View File

@ -27,12 +27,8 @@ function MempoolMessage(options) {
} }
inherits(MempoolMessage, Message); inherits(MempoolMessage, Message);
MempoolMessage.fromObject = function(options) {
return new MempoolMessage(options);
};
MempoolMessage.fromBuffer = function(payload) { MempoolMessage.fromBuffer = function(payload) {
return MempoolMessage.fromObject({}); return new MempoolMessage({});
}; };
MempoolMessage.prototype.getPayload = function() { MempoolMessage.prototype.getPayload = function() {

View File

@ -34,15 +34,11 @@ function MerkleblockMessage(options) {
} }
inherits(MerkleblockMessage, Message); inherits(MerkleblockMessage, Message);
MerkleblockMessage.fromObject = function(options) {
return new MerkleblockMessage(options);
};
MerkleblockMessage.fromBuffer = function(payload) { MerkleblockMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
$.checkArgument(BufferUtil.isBuffer(payload)); $.checkArgument(BufferUtil.isBuffer(payload));
obj.merkleBlock = MerkleBlock.fromBuffer(payload); obj.merkleBlock = MerkleBlock.fromBuffer(payload);
return MerkleblockMessage.fromObject(obj); return new MerkleblockMessage(obj);
}; };
MerkleblockMessage.prototype.getPayload = function() { MerkleblockMessage.prototype.getPayload = function() {

View File

@ -63,10 +63,6 @@ NotfoundMessage.forFilteredBlock = function(hash) {
return new NotfoundMessage([Inventory.forFilteredBlock(hash)]); return new NotfoundMessage([Inventory.forFilteredBlock(hash)]);
}; };
NotfoundMessage.fromObject = function(options) {
return new NotfoundMessage(options);
};
NotfoundMessage.fromBuffer = function(payload) { NotfoundMessage.fromBuffer = function(payload) {
var obj = { var obj = {
inventory: [] inventory: []
@ -81,7 +77,7 @@ NotfoundMessage.fromBuffer = function(payload) {
} }
utils.checkFinished(parser); utils.checkFinished(parser);
return NotfoundMessage.fromObject(obj); return new NotfoundMessage(obj);
}; };
NotfoundMessage.prototype.getPayload = function() { NotfoundMessage.prototype.getPayload = function() {

View File

@ -33,17 +33,13 @@ PingMessage.prototype.getPayload = function() {
return this.nonce; return this.nonce;
}; };
PingMessage.fromObject = function(obj) {
return new PingMessage(obj);
};
PingMessage.fromBuffer = function(payload) { PingMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
obj.nonce = parser.read(8); obj.nonce = parser.read(8);
utils.checkFinished(parser); utils.checkFinished(parser);
return PingMessage.fromObject(obj); return new PingMessage(obj);
}; };
module.exports = function(options) { module.exports = function(options) {

View File

@ -29,17 +29,13 @@ function PongMessage(options) {
} }
inherits(PongMessage, Message); inherits(PongMessage, Message);
PongMessage.fromObject = function(obj) {
return new PongMessage(obj);
};
PongMessage.fromBuffer = function(payload) { PongMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
obj.nonce = parser.read(8); obj.nonce = parser.read(8);
utils.checkFinished(parser); utils.checkFinished(parser);
return PongMessage.fromObject(obj); return new PongMessage(obj);
}; };
PongMessage.prototype.getPayload = function() { PongMessage.prototype.getPayload = function() {

View File

@ -21,13 +21,9 @@ function RejectMessage(options) {
} }
inherits(RejectMessage, Message); inherits(RejectMessage, Message);
RejectMessage.fromObject = function(options) {
return new RejectMessage(options);
};
RejectMessage.fromBuffer = function(payload) { RejectMessage.fromBuffer = function(payload) {
var obj = {}; var obj = {};
return RejectMessage.fromObject(obj); return new RejectMessage(obj);
}; };
RejectMessage.prototype.getPayload = function() { RejectMessage.prototype.getPayload = function() {

View File

@ -35,10 +35,6 @@ function TransactionMessage(options) {
} }
inherits(TransactionMessage, Message); inherits(TransactionMessage, Message);
TransactionMessage.fromObject = function(options) {
return new TransactionMessage(options);
};
TransactionMessage.fromBuffer = function(payload) { TransactionMessage.fromBuffer = function(payload) {
var transaction; var transaction;
if (Transaction.prototype.fromBuffer) { if (Transaction.prototype.fromBuffer) {
@ -46,7 +42,7 @@ TransactionMessage.fromBuffer = function(payload) {
} else { } else {
transaction = Transaction.fromBuffer(payload); transaction = Transaction.fromBuffer(payload);
} }
return TransactionMessage.fromObject({transaction: transaction}); return new TransactionMessage({transaction: transaction});
}; };
TransactionMessage.prototype.getPayload = function() { TransactionMessage.prototype.getPayload = function() {

View File

@ -25,12 +25,8 @@ function VerackMessage(options) {
} }
inherits(VerackMessage, Message); inherits(VerackMessage, Message);
VerackMessage.fromObject = function(obj) {
return new VerackMessage(obj);
};
VerackMessage.fromBuffer = function(payload) { VerackMessage.fromBuffer = function(payload) {
return VerackMessage.fromObject({}); return new VerackMessage({});
}; };
VerackMessage.prototype.getPayload = function() { VerackMessage.prototype.getPayload = function() {

View File

@ -46,10 +46,6 @@ function VersionMessage(obj) {
} }
inherits(VersionMessage, Message); inherits(VersionMessage, Message);
VersionMessage.fromObject = function(obj) {
return new VersionMessage(obj);
};
VersionMessage.fromBuffer = function(payload) { VersionMessage.fromBuffer = function(payload) {
var parser = new BufferReader(payload); var parser = new BufferReader(payload);
var obj = {}; var obj = {};
@ -78,7 +74,7 @@ VersionMessage.fromBuffer = function(payload) {
} }
utils.checkFinished(parser); utils.checkFinished(parser);
return VersionMessage.fromObject(obj); return new VersionMessage(obj);
}; };
VersionMessage.prototype.getPayload = function() { VersionMessage.prototype.getPayload = function() {

View File

@ -63,7 +63,7 @@ describe('Messages Builder', function() {
it('#relay setting works', function() { it('#relay setting works', function() {
[true,false].forEach(function(relay) { [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); message.relay.should.equal(relay);
var messageBuf = message.getPayload(); var messageBuf = message.getPayload();
var newMessage = b.commands.version.fromBuffer(messageBuf); var newMessage = b.commands.version.fromBuffer(messageBuf);