Page MenuHomePhabricator
Files F12944929

D13385.id38975.diff
No OneTemporary
Actions

D13385.id38975.diff
View Options

diff --git a/web/alias-server/alias.js b/web/alias-server/alias.js
--- a/web/alias-server/alias.js
+++ b/web/alias-server/alias.js
@@ -209,7 +209,6 @@
config.aliasConstants.reservedAliases,
);
let validAliasTxs = [];
- const pendingAliasTxs = [];
// Add reservedAliasTxs to validAliasTxs
const reservedAliasTxs = generateReservedAliasTxArray();
@@ -232,9 +231,6 @@
if (blockheight < 100000000) {
// Add thisAliasObject to the validAliasObjects array
validAliasTxs.push(thisAliasTx);
- } else {
- // If it is not confirmed, add it to pendingAliasObjects
- pendingAliasTxs.push(thisAliasTx);
}
} else {
// If you've already seen it at an earlier blockheight or earlier alphabetical txid,
@@ -245,6 +241,6 @@
continue;
}
}
- return { validAliasTxs, pendingAliasTxs };
+ return validAliasTxs;
},
};
diff --git a/web/alias-server/scripts/aliasTestsLive.js b/web/alias-server/scripts/aliasTestsLive.js
--- a/web/alias-server/scripts/aliasTestsLive.js
+++ b/web/alias-server/scripts/aliasTestsLive.js
@@ -101,11 +101,10 @@
*/
const aliasRegistrations = getValidAliasRegistrations(allPotentialAliasTxs);
- const { validAliasTxs } = aliasRegistrations;
// Get the blockheight of the most recently registered alias tx
const highestRegisteredBlockheight =
- validAliasTxs[validAliasTxs.length - 1].blockheight;
+ aliasRegistrations[aliasRegistrations.length - 1].blockheight;
fs.writeFileSync(
`${mocksDir}/aliasRegistrations_${highestRegisteredBlockheight}.json`,
JSON.stringify(aliasRegistrations, null, 2),
@@ -238,17 +237,15 @@
*/
const thisLiveTestProcessedAliasRegistrations =
getValidAliasRegistrations(thisLiveTestProcessedPotentialAliasTxs);
- const theseLiveTestProcessedValidAliasTxs =
- thisLiveTestProcessedAliasRegistrations.validAliasTxs;
// Parse this live tests unprocessed txs to get its valid alias registrations
const thisLiveTestUnProcessedPotentialAliasTxs = getAliasTxs(
liveTestUnprocessedTxs,
config.aliasConstants,
);
- // get registered aliases from theseLiveTestProcessedValidAliasTxs
+ // get registered aliases from thisLiveTestProcessedAliasRegistrations
const thisLiveTestRegisteredAliases = getAliasStringsFromValidAliases(
- theseLiveTestProcessedValidAliasTxs,
+ thisLiveTestProcessedAliasRegistrations,
);
// Incrementally determine valid aliases from unprocessedtxs
const thisLiveTestUnprocessedAliasRegistrations =
@@ -291,13 +288,13 @@
'utf-8',
);
}
- // expect theseLiveTestProcessedValidAliasTxs.concat(thisLiveTestUnprocessedAliasRegistrations) === validAliasTxs
+ // expect thisLiveTestProcessedAliasRegistrations.concat(thisLiveTestUnprocessedAliasRegistrations) === validAliasTxs
try {
assert.deepEqual(
- theseLiveTestProcessedValidAliasTxs.concat(
+ thisLiveTestProcessedAliasRegistrations.concat(
thisLiveTestUnprocessedAliasRegistrations,
),
- validAliasTxs,
+ aliasRegistrations,
);
console.log(
'\x1b[32m%s\x1b[0m',
diff --git a/web/alias-server/scripts/generateMocks.js b/web/alias-server/scripts/generateMocks.js
--- a/web/alias-server/scripts/generateMocks.js
+++ b/web/alias-server/scripts/generateMocks.js
@@ -115,18 +115,12 @@
pendingAliasObjects are alias registrations that will be valid after the tx confirmed,
assuming no other tx with an alphabetically earlier txid comes into the same block
*/
- const { validAliasTxs, pendingAliasTxs } =
- getValidAliasRegistrations(allAliasTxs);
+ const validAliasTxs = getValidAliasRegistrations(allAliasTxs);
fs.writeFileSync(
`${mocksDir}/validAliasTxs.json`,
JSON.stringify(validAliasTxs, null, 2),
'utf-8',
);
- fs.writeFileSync(
- `${mocksDir}/pendingAliasTxs.json`,
- JSON.stringify(pendingAliasTxs, null, 2),
- 'utf-8',
- );
const reservedAliasTxArray = generateReservedAliasTxArray();
fs.writeFileSync(
diff --git a/web/alias-server/test/alias.js b/web/alias-server/test/alias.js
--- a/web/alias-server/test/alias.js
+++ b/web/alias-server/test/alias.js
@@ -146,32 +146,23 @@
it('Correctly returns only valid alias registrations at test address ecash:qp3c268rd5946l2f5m5es4x25f7ewu4sjvpy52pqa8', function () {
assert.deepEqual(
getValidAliasRegistrations(testAddressAliases.allAliasTxs),
- {
- validAliasTxs: testAddressAliases.validAliasTxs,
- pendingAliasTxs: [],
- },
+
+ testAddressAliases.validAliasTxs,
);
});
- it('Correctly returns valid and pending alias registrations at test address ecash:qp3c268rd5946l2f5m5es4x25f7ewu4sjvpy52pqa8', function () {
+ it('Correctly returns valid alias registrations at test address ecash:qp3c268rd5946l2f5m5es4x25f7ewu4sjvpy52pqa8', function () {
assert.deepEqual(
getValidAliasRegistrations(
testAddressAliasesWithUnconfirmedTxs.allAliasTxs,
),
- {
- validAliasTxs:
- testAddressAliasesWithUnconfirmedTxs.validAliasTxs,
- pendingAliasTxs:
- testAddressAliasesWithUnconfirmedTxs.pendingAliasTxs,
- },
+
+ testAddressAliasesWithUnconfirmedTxs.validAliasTxs,
);
});
it('getValidAliasRegistrations recognizes case variations of a taken alias as invalid', function () {
assert.deepEqual(
getValidAliasRegistrations(aliases_fake_data.allAliasTxsMixedCases),
- {
- validAliasTxs: aliases_fake_data.validAliasTxsMixedCases,
- pendingAliasTxs: [],
- },
+ aliases_fake_data.validAliasTxsMixedCases,
);
});
it('getAliasStringsFromValidAliases extracts aliases only from array of valid alias txs as stored in server db', function () {

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 6, 16:18 (17 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5082677
Default Alt Text
D13385.id38975.diff (6 KB)

Event Timeline