ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-21 04:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix transaction sequencing

Browse Source
This commit is contained in:
wltsmrz
2015-07-27 23:17:02 -07:00
parent 4568b39997
commit fae22b7023
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/transactionmanager.js
View File

@@ -728,8 +728,7 @@ TransactionManager.prototype.submit = function(tx) {
if (typeof tx.tx_json.Sequence !== 'number') { if (typeof tx.tx_json.Sequence !== 'number') {
// Honor manually-set sequences // Honor manually-set sequences
this._nextSequence += 1; tx.tx_json.Sequence = this._nextSequence++;
tx.tx_json.Sequence = this._nextSequence;
} }
tx.once('cleanup', function() { tx.once('cleanup', function() {

26
test/transaction-manager-test.js
View File

@@ -425,6 +425,8 @@ describe('TransactionManager', function() {
rippled.once('request_submit', function(m, req) { rippled.once('request_submit', function(m, req) {
assert.strictEqual(m.tx_blob, SerializedObject.from_json( assert.strictEqual(m.tx_blob, SerializedObject.from_json(
transaction.tx_json).to_hex()); transaction.tx_json).to_hex());
assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
assert.strictEqual(transactionManager.getPending().length(), 1); assert.strictEqual(transactionManager.getPending().length(), 1);
req.sendResponse(SUBMIT_RESPONSE, {id: m.id}); req.sendResponse(SUBMIT_RESPONSE, {id: m.id});
setImmediate(function() { setImmediate(function() {
@@ -463,6 +465,8 @@ describe('TransactionManager', function() {
rippled.once('request_submit', function(m, req) { rippled.once('request_submit', function(m, req) {
assert.strictEqual(m.tx_blob, SerializedObject.from_json( assert.strictEqual(m.tx_blob, SerializedObject.from_json(
transaction.tx_json).to_hex()); transaction.tx_json).to_hex());
assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
assert.strictEqual(transactionManager.getPending().length(), 1); assert.strictEqual(transactionManager.getPending().length(), 1);
req.sendResponse(SUBMIT_TEC_RESPONSE, {id: m.id}); req.sendResponse(SUBMIT_TEC_RESPONSE, {id: m.id});
setImmediate(function() { setImmediate(function() {
@@ -506,13 +510,15 @@ describe('TransactionManager', function() {
switch (deserialized.TransactionType) { switch (deserialized.TransactionType) {
case 'Payment': case 'Payment':
assert.strictEqual(transactionManager.getPending().length(), 1);
assert.deepEqual(deserialized, transaction.tx_json); assert.deepEqual(deserialized, transaction.tx_json);
assert.strictEqual(transactionManager.getPending().length(), 1);
req.sendResponse(SUBMIT_TER_RESPONSE, {id: m.id}); req.sendResponse(SUBMIT_TER_RESPONSE, {id: m.id});
break; break;
case 'AccountSet': case 'AccountSet':
assert.strictEqual(deserialized.Account, ACCOUNT.address); assert.strictEqual(deserialized.Account, ACCOUNT.address);
assert.strictEqual(deserialized.Flags, 2147483648); assert.strictEqual(deserialized.Flags, 2147483648);
assert.strictEqual(deserialized.Sequence,
ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
req.sendResponse(SUBMIT_RESPONSE, {id: m.id}); req.sendResponse(SUBMIT_RESPONSE, {id: m.id});
req.closeLedger(); req.closeLedger();
break; break;
@@ -568,9 +574,9 @@ describe('TransactionManager', function() {
}); });
rippled.on('request_submit', function(m, req) { rippled.on('request_submit', function(m, req) {
assert.strictEqual(transactionManager.getPending().length(), 1);
assert.strictEqual(m.tx_blob, SerializedObject.from_json( assert.strictEqual(m.tx_blob, SerializedObject.from_json(
transaction.tx_json).to_hex()); transaction.tx_json).to_hex());
assert.strictEqual(transactionManager.getPending().length(), 1);
req.sendResponse(SUBMIT_TEF_RESPONSE, {id: m.id}); req.sendResponse(SUBMIT_TEF_RESPONSE, {id: m.id});
}); });
@@ -626,9 +632,11 @@ describe('TransactionManager', function() {
}); });
rippled.on('request_submit', function(m, req) { rippled.on('request_submit', function(m, req) {
assert.strictEqual(transactionManager.getPending().length(), 1);
assert.strictEqual(m.tx_blob, SerializedObject.from_json( assert.strictEqual(m.tx_blob, SerializedObject.from_json(
transaction.tx_json).to_hex()); transaction.tx_json).to_hex());
assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
assert.strictEqual(transactionManager.getPending().length(), 1);
req.sendResponse(SUBMIT_TEL_RESPONSE, {id: m.id}); req.sendResponse(SUBMIT_TEL_RESPONSE, {id: m.id});
}); });
@@ -729,9 +737,11 @@ describe('TransactionManager', function() {
}); });
rippled.on('request_submit', function(m, req) { rippled.on('request_submit', function(m, req) {
assert.strictEqual(transactionManager.getPending().length(), 1);
assert.strictEqual(m.tx_blob, SerializedObject.from_json( assert.strictEqual(m.tx_blob, SerializedObject.from_json(
transaction.tx_json).to_hex()); transaction.tx_json).to_hex());
assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
assert.strictEqual(transactionManager.getPending().length(), 1);
/* eslint-disable max-len */ /* eslint-disable max-len */
@@ -787,9 +797,11 @@ describe('TransactionManager', function() {
}); });
rippled.on('request_submit', function(m, req) { rippled.on('request_submit', function(m, req) {
assert.strictEqual(transactionManager.getPending().length(), 1);
assert.strictEqual(m.tx_blob, SerializedObject.from_json( assert.strictEqual(m.tx_blob, SerializedObject.from_json(
transaction.tx_json).to_hex()); transaction.tx_json).to_hex());
assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
assert.strictEqual(transactionManager.getPending().length(), 1);
req.sendResponse(SUBMIT_TEL_RESPONSE, {id: m.id}); req.sendResponse(SUBMIT_TEL_RESPONSE, {id: m.id});
}); });
@@ -852,9 +864,11 @@ describe('TransactionManager', function() {
}); });
rippled.on('request_submit', function(m, req) { rippled.on('request_submit', function(m, req) {
assert.strictEqual(transactionManager.getPending().length(), 1);
assert.strictEqual(m.tx_blob, SerializedObject.from_json( assert.strictEqual(m.tx_blob, SerializedObject.from_json(
transaction.tx_json).to_hex()); transaction.tx_json).to_hex());
assert.strictEqual(new SerializedObject(m.tx_blob).to_json().Sequence,
ACCOUNT_INFO_RESPONSE.result.account_data.Sequence);
assert.strictEqual(transactionManager.getPending().length(), 1);
req.sendResponse(SUBMIT_TOO_BUSY_ERROR, {id: m.id}); req.sendResponse(SUBMIT_TOO_BUSY_ERROR, {id: m.id});
}); });