Merge PR #817 from 'nodech/chain-cleanup-namestatus'

handshake-org · May 29, 2023 · 433d5e9 · 433d5e9
2 parents 61c1e05 + 0c834ac
commit 433d5e9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 28 deletions.
diff --git a/lib/blockchain/chaindb.js b/lib/blockchain/chaindb.js
@@ -1316,16 +1316,13 @@ class ChainDB {
   /**
    * Get name status.
    * @param {Buffer} nameHash
+   * @param {Number} height - used for expiration checks.
    * @returns {Promise<NameState>}
    */
 
-  async getNameStatus(nameHash, height, hardened) {
-    if (hardened == null)
-      hardened = false;
-
+  async getNameStatus(nameHash, height) {
     assert(Buffer.isBuffer(nameHash));
     assert((height >>> 0) === height);
-    assert(typeof hardened === 'boolean');
 
     const network = this.network;
     const ns = await this.getNameState(nameHash);

diff --git a/lib/node/fullnode.js b/lib/node/fullnode.js
@@ -670,8 +670,7 @@ class FullNode extends Node {
 
   async getNameStatus(nameHash) {
     const height = this.chain.height + 1;
-    const hardened = await this.mempool.hasHardening();
-    return this.chain.db.getNameStatus(nameHash, height, hardened);
+    return this.chain.db.getNameStatus(nameHash, height);
   }
 }
 

diff --git a/test/auction-reorg-test.js b/test/auction-reorg-test.js
@@ -62,9 +62,7 @@ function createNode() {
       wallet.getNameStatus = async (nameHash) => {
         assert(Buffer.isBuffer(nameHash));
         const height = chain.height + 1;
-        const state = await chain.getNextState();
-        const hardened = state.hasHardening();
-        return chain.db.getNameStatus(nameHash, height, hardened);
+        return chain.db.getNameStatus(nameHash, height);
       };
 
       return wallet;

diff --git a/test/auction-test.js b/test/auction-test.js
@@ -58,9 +58,7 @@ function createNode() {
       wallet.getNameStatus = async (nameHash) => {
         assert(Buffer.isBuffer(nameHash));
         const height = chain.height + 1;
-        const state = await chain.getNextState();
-        const hardened = state.hasHardening();
-        return chain.db.getNameStatus(nameHash, height, hardened);
+        return chain.db.getNameStatus(nameHash, height);
       };
 
       return wallet;

diff --git a/test/chain-full-test.js b/test/chain-full-test.js
@@ -737,9 +737,7 @@ describe('Chain', function() {
       wallet.getNameStatus = async (nameHash) => {
         assert(Buffer.isBuffer(nameHash));
         const height = chain.height + 1;
-        const state = await chain.getNextState();
-        const hardened = state.hasHardening();
-        return chain.db.getNameStatus(nameHash, height, hardened);
+        return chain.db.getNameStatus(nameHash, height);
       };
     });
 

diff --git a/test/mempool-test.js b/test/mempool-test.js
@@ -618,9 +618,7 @@ describe('Mempool', function() {
     chaincoins.getNameStatus = async (nameHash) => {
       assert(Buffer.isBuffer(nameHash));
       const height = chain.height + 1;
-      const state = await chain.getNextState();
-      const hardened = state.hasHardening();
-      return chain.db.getNameStatus(nameHash, height, hardened);
+      return chain.db.getNameStatus(nameHash, height);
     };
 
     it('should create coins in chain', async () => {

diff --git a/test/txstart-test.js b/test/txstart-test.js
@@ -41,9 +41,7 @@ node.chain.on('connect', (entry, block) => {
 wallet.getNameStatus = async (nameHash) => {
   assert(Buffer.isBuffer(nameHash));
   const height = node.chain.height + 1;
-  const state = await node.chain.getNextState();
-  const hardened = state.hasHardening();
-  return node.chain.db.getNameStatus(nameHash, height, hardened);
+  return node.chain.db.getNameStatus(nameHash, height);
 };
 
 describe('Disable TXs', function() {

diff --git a/test/wallet-rescan-test.js b/test/wallet-rescan-test.js
@@ -46,9 +46,7 @@ describe('Wallet rescan with namestate transitions', function() {
     alice.getNameStatus = async (nameHash) => {
       assert(Buffer.isBuffer(nameHash));
       const height = node.chain.height + 1;
-      const state = await node.chain.getNextState();
-      const hardened = state.hasHardening();
-      return node.chain.db.getNameStatus(nameHash, height, hardened);
+      return node.chain.db.getNameStatus(nameHash, height);
     };
 
     const NAME = rules.grindName(GNAME_SIZE, 4, network);
@@ -300,9 +298,7 @@ describe('Wallet rescan with namestate transitions', function() {
     alice.getNameStatus = async (nameHash) => {
       assert(Buffer.isBuffer(nameHash));
       const height = node.chain.height + 1;
-      const state = await node.chain.getNextState();
-      const hardened = state.hasHardening();
-      return node.chain.db.getNameStatus(nameHash, height, hardened);
+      return node.chain.db.getNameStatus(nameHash, height);
     };
 
     const NAME = rules.grindName(GNAME_SIZE, 4, network);