[FIX] ledgerSelect setting both ledger_index and ledger_hash

This commit is contained in:
Geert Weening
2014-10-28 17:16:24 -07:00
parent d861bb2e34
commit cdf1112666
2 changed files with 5 additions and 1 deletions

View File

@@ -226,7 +226,7 @@ Request.prototype.ledgerSelect = function(ledger) {
default: default:
if (Number(ledger)) { if (Number(ledger)) {
this.message.ledger_index = Number(ledger); this.message.ledger_index = Number(ledger);
} if (/^[A-F0-9]+$/.test(ledger)) { } else if (/^[A-F0-9]+$/.test(ledger)) {
this.message.ledger_hash = ledger; this.message.ledger_hash = ledger;
} }
break; break;

View File

@@ -326,6 +326,7 @@ describe('Request', function() {
var request = new Request(remote, 'server_info'); var request = new Request(remote, 'server_info');
request.ledgerChoose(); request.ledgerChoose();
assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE'); assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
assert.strictEqual(request.message.ledger_index, void(0));
}); });
it('Select ledger - identifier', function() { it('Select ledger - identifier', function() {
@@ -335,6 +336,7 @@ describe('Request', function() {
var request = new Request(remote, 'server_info'); var request = new Request(remote, 'server_info');
request.ledgerSelect('validated'); request.ledgerSelect('validated');
assert.strictEqual(request.message.ledger_index, 'validated'); assert.strictEqual(request.message.ledger_index, 'validated');
assert.strictEqual(request.message.ledger_hash, void(0));
}); });
it('Select ledger - index', function() { it('Select ledger - index', function() {
@@ -344,6 +346,7 @@ describe('Request', function() {
var request = new Request(remote, 'server_info'); var request = new Request(remote, 'server_info');
request.ledgerSelect(7016915); request.ledgerSelect(7016915);
assert.strictEqual(request.message.ledger_index, 7016915); assert.strictEqual(request.message.ledger_index, 7016915);
assert.strictEqual(request.message.ledger_hash, void(0));
}); });
it('Select ledger - hash', function() { it('Select ledger - hash', function() {
@@ -353,6 +356,7 @@ describe('Request', function() {
var request = new Request(remote, 'server_info'); var request = new Request(remote, 'server_info');
request.ledgerSelect('B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE'); request.ledgerSelect('B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE'); assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE');
assert.strictEqual(request.message.ledger_index, void(0));
}); });
it('Select ledger - undefined', function() { it('Select ledger - undefined', function() {