Page MenuHomePhabricator
Files F13711132

D13314.id38517.diff
No OneTemporary
Actions

D13314.id38517.diff
View Options

diff --git a/web/alias-server/test/utils.js b/web/alias-server/test/utils.js
--- a/web/alias-server/test/utils.js
+++ b/web/alias-server/test/utils.js
@@ -7,8 +7,10 @@
getHexFromAlias,
getAliasBytecount,
isValidAliasString,
+ removeUnconfirmedTxsFromTxHistory,
} = require('../utils');
const reservedAliasTxs = require('./mocks/reservedAliasTxs');
+const unconfirmedAliasTxs = require('./mocks/unconfirmedAliasTxs');
const {
validAliasesInDb,
validAliasTxs,
@@ -17,6 +19,7 @@
validAliasStrings,
invalidAliasStrings,
} = require('./mocks/utilsMocks');
+const { testAddressAliases } = require('./mocks/aliasMocks');
describe('alias-server utils.js', function () {
it('Converts a P2PKH output script to a valid P2PKH ecash: address', function () {
@@ -90,4 +93,12 @@
assert.deepEqual(isValidAliasString(invalidAliasString), false);
}
});
+ it('removeUnconfirmedTxsFromTxHistory removes unconfirmed txs from an array of chronik tx history', function () {
+ assert.deepEqual(
+ removeUnconfirmedTxsFromTxHistory(
+ unconfirmedAliasTxs.concat(testAddressAliases.txHistory),
+ ),
+ testAddressAliases.txHistory,
+ );
+ });
});
diff --git a/web/alias-server/utils.js b/web/alias-server/utils.js
--- a/web/alias-server/utils.js
+++ b/web/alias-server/utils.js
@@ -102,4 +102,15 @@
*/
return /^[a-z0-9]+$/.test(alias);
},
+ removeUnconfirmedTxsFromTxHistory: function (txHistory) {
+ // Remove unconfirmed txs from an array of chronik tx objects
+ const confirmedTxHistory = [];
+ for (let i = 0; i < txHistory.length; i += 1) {
+ const thisTx = txHistory[i];
+ if (typeof thisTx.block !== 'undefined') {
+ confirmedTxHistory.push(thisTx);
+ }
+ }
+ return confirmedTxHistory;
+ },
};

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 10:35 (5 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5573285
Default Alt Text
D13314.id38517.diff (1 KB)

Event Timeline