Added preconditions to ping message

This commit is contained in:
Braydon Fuller 2015-04-01 11:55:00 -04:00
parent 79674a2d7b
commit 28b05e3cc1
3 changed files with 30 additions and 4 deletions

View File

@ -4,6 +4,9 @@ var Message = require('../message');
var inherits = require('util').inherits;
var bitcore = require('bitcore');
var utils = require('../utils');
var $ = bitcore.util.preconditions;
var _ = bitcore.deps._;
var BufferUtil = bitcore.util.buffer;
var BufferReader = bitcore.encoding.BufferReader;
/**
@ -18,6 +21,10 @@ function PingMessage(arg, options) {
Message.call(this, arg, options);
this.command = 'ping';
this.magicNumber = options.magicNumber;
$.checkArgument(
_.isUndefined(arg) || (BufferUtil.isBuffer(arg) && arg.length === 8),
'First argument is expected to be an 8 byte buffer'
);
this.nonce = arg || utils.getNonce();
}
inherits(PingMessage, Message);

View File

@ -25,10 +25,7 @@ function PongMessage(arg, options) {
_.isUndefined(arg) || (BufferUtil.isBuffer(arg) && arg.length === 8),
'First argument is expected to be an 8 byte buffer'
);
this.nonce = arg;
if (!this.nonce) {
this.nonce = utils.getNonce();
}
this.nonce = arg || utils.getNonce();
}
inherits(PongMessage, Message);

View File

@ -80,6 +80,28 @@ describe('Command Messages', function() {
});
describe('Ping', function() {
it('should error if nonce is not a buffer', function() {
(function() {
var message = messages.Ping('not a buffer');
}).should.throw('First argument is expected to be an 8 byte buffer');
});
it('should error if nonce buffer has invalid length', function() {
(function() {
var message = messages.Ping(new Buffer(Array(9)));
}).should.throw('First argument is expected to be an 8 byte buffer');
});
it('should set a nonce if not included', function() {
var message = messages.Ping();
should.exist(message.nonce);
message.nonce.length.should.equal(8);
});
});
describe('FilterLoad', function() {
it('should return a null payload', function() {