hdmint mempool zap fix (#852)

* hdmint mempool zap fix * Fix for zapwalletmints test
firoorg · Jun 3, 2020 · 50822ba · 50822ba
1 parent 3de577b
commit 50822ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/qa/rpc-tests/hdmint_mempool_zap.py b/qa/rpc-tests/hdmint_mempool_zap.py
@@ -65,7 +65,7 @@ def hdmint_zap(self, configuration):
         bitcoind_processes[0].wait()
 
         self.nodes[0] = start_node(0,self.options.tmpdir, configuration)
-
+        time.sleep(1) # rescan time
         sigma_mints2 = self.list_unspent_sigma_mints()
 
         assert sigma_mints2 == sigma_mints1, \
@@ -78,7 +78,7 @@ def hdmint_zap(self, configuration):
         bitcoind_processes[0].wait()
 
         self.nodes[0] = start_node(0, self.options.tmpdir, configuration)
-
+        time.sleep(1) # rescan time
         sigma_mints3 = self.list_unspent_sigma_mints()
 
         assert sigma_mints3 == sigma_mints1, \

diff --git a/qa/rpc-tests/sigma_zapwalletmints.py b/qa/rpc-tests/sigma_zapwalletmints.py
@@ -44,10 +44,14 @@ def run_test(self):
             .format(len(sigma_mints1))
 
         # stop nodes
+        blockcount = self.nodes[0].getblockcount()
         stop_nodes(self.nodes)
-
         self.nodes = start_nodes(1, self.options.tmpdir, "-zapwalletmints")
         self.sync_all()
+        while self.nodes[0].getblockcount() < blockcount:
+            time.sleep(0.1)
+        time.sleep(1) # to handle rescan following reindex
+
         sigma_mints2 = self.nodes[0].listunspentsigmamints()
 
         assert len(sigma_mints2) == len(sigma_mints1), \