From cdf111266608c7438fcee692e5be198b96de02e5 Mon Sep 17 00:00:00 2001 From: Geert Weening Date: Tue, 28 Oct 2014 17:16:24 -0700 Subject: [PATCH] [FIX] ledgerSelect setting both `ledger_index` and `ledger_hash` --- src/js/ripple/request.js | 2 +- test/request-test.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/ripple/request.js b/src/js/ripple/request.js index 18859536..b5b1572e 100644 --- a/src/js/ripple/request.js +++ b/src/js/ripple/request.js @@ -226,7 +226,7 @@ Request.prototype.ledgerSelect = function(ledger) { default: if (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; } break; diff --git a/test/request-test.js b/test/request-test.js index b6abdb82..dd395f7e 100644 --- a/test/request-test.js +++ b/test/request-test.js @@ -326,6 +326,7 @@ describe('Request', function() { var request = new Request(remote, 'server_info'); request.ledgerChoose(); assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE'); + assert.strictEqual(request.message.ledger_index, void(0)); }); it('Select ledger - identifier', function() { @@ -335,6 +336,7 @@ describe('Request', function() { var request = new Request(remote, 'server_info'); request.ledgerSelect('validated'); assert.strictEqual(request.message.ledger_index, 'validated'); + assert.strictEqual(request.message.ledger_hash, void(0)); }); it('Select ledger - index', function() { @@ -344,6 +346,7 @@ describe('Request', function() { var request = new Request(remote, 'server_info'); request.ledgerSelect(7016915); assert.strictEqual(request.message.ledger_index, 7016915); + assert.strictEqual(request.message.ledger_hash, void(0)); }); it('Select ledger - hash', function() { @@ -353,6 +356,7 @@ describe('Request', function() { var request = new Request(remote, 'server_info'); request.ledgerSelect('B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE'); assert.strictEqual(request.message.ledger_hash, 'B4FD84A73DBD8F0DA9E320D137176EBFED969691DC0AAC7882B76B595A0841AE'); + assert.strictEqual(request.message.ledger_index, void(0)); }); it('Select ledger - undefined', function() {