Update functional test wallet_autocombine.py

panleone · Fuzzbawls · commit 63488be61d48 · 2023-03-04T19:19:43.000-08:00
diff --git a/test/functional/wallet_autocombine.py b/test/functional/wallet_autocombine.py
@@ -25,6 +25,8 @@ def run_test(self):
         # Check the failure conditions for setautocombinethreshold
         assert_raises_rpc_error(-8, "Missing threshold value", self.nodes[0].setautocombinethreshold, True)
         assert_raises_rpc_error(-8, "The threshold value cannot be less than 1.00", self.nodes[0].setautocombinethreshold, True, 0.99)
+        assert_raises_rpc_error(-8, "Frequency must be greater than 0", self.nodes[0].setautocombinethreshold, True, 2, -1)
+        assert_raises_rpc_error(-8, "The threshold value cannot be less than 1.00", self.nodes[0].setautocombinethreshold, True, 0.99)
 
         self.log.info("Mining initial 100 blocks...")
         self.nodes[0].generate(100)
@@ -37,39 +39,46 @@ def run_test(self):
         self.nodes[0].generate(2)
 
         walletinfo = self.nodes[0].getwalletinfo()
-        assert_equal(walletinfo['balance'], 500)
+        assert_equal(walletinfo['balance'], 250*2)
         assert_equal(walletinfo['txcount'], 102)
 
-        self.log.info("Set autocombine to 500 PIV")
-        setautocombine = self.nodes[0].setautocombinethreshold(True, 500)
+        self.log.info("Set autocombine to 500 PIV and frequency of 10")
+        setautocombine = self.nodes[0].setautocombinethreshold(True, 500, 10)
         assert_equal(setautocombine['enabled'], True)
         assert_equal(setautocombine['threshold'], 500)
+        assert_equal(setautocombine['frequency'], 10)
         getautocombine = self.nodes[0].getautocombinethreshold()
         assert_equal(getautocombine['enabled'], True)
         assert_equal(getautocombine['threshold'], 500)
+        assert_equal(getautocombine['frequency'], 10)
         walletinfo = self.nodes[0].getwalletinfo()
         assert_equal(walletinfo['autocombine_enabled'], True)
         assert_equal(walletinfo['autocombine_threshold'], 500)
+        assert_equal(walletinfo['autocombine_frequency'], 10)
 
-        self.log.info("Mine 1 more block to initiate an autocombine transaction")
-        self.nodes[0].generate(1)
+        self.log.info("Mine 8 more block to initiate an autocombine transaction")
+
+        self.nodes[0].generate(8)  # we need 8 more blocks to get a multiple of 10
+        assert_equal(0, self.nodes[0].getblockcount() % 10)
         time.sleep(1)
 
         mempool = self.nodes[0].getrawmempool()
         assert_equal(len(mempool), 1)
         tx = mempool[0]
         nFee = self.nodes[0].getrawmempool(True)[mempool[0]]['fee']
         walletinfo = self.nodes[0].getwalletinfo()
-        assert_equal(walletinfo['balance'], 750 - nFee)
-        assert_equal(walletinfo['txcount'], 104)
+        assert_equal(walletinfo['balance'], 250*10 - nFee)
+        assert_equal(walletinfo['txcount'], 111)  # 110 coinbase txs + 1 to autocollect
 
         self.log.info("Mine 1 more block to confirm the autocombine transaction")
         block = self.nodes[0].generate(1)
         time.sleep(1)
 
         walletinfo = self.nodes[0].getwalletinfo()
-        assert_equal(walletinfo['balance'], 250 + 750 - nFee)
-        assert_equal(walletinfo['txcount'], 105)
+        assert_equal(walletinfo['balance'], 250*11 - nFee)
+        # 111 coinbase txs + 1 autocollect, good autocollect was not called again since nBlock % 10 = 1
+        assert_equal(1, self.nodes[0].getblockcount() % 10)
+        assert_equal(walletinfo['txcount'], 112)
 
         txinfo = self.nodes[0].gettransaction(tx)
         assert_equal(txinfo['fee'], 0 - nFee)
@@ -81,12 +90,17 @@ def run_test(self):
         setautocombine = self.nodes[0].setautocombinethreshold(False)
         assert_equal(setautocombine['enabled'], False)
         assert_equal(setautocombine['threshold'], 0)
+        assert_equal(setautocombine['frequency'], 30)  # set back to default value
+
         getautocombine = self.nodes[0].getautocombinethreshold()
         assert_equal(getautocombine['enabled'], False)
         assert_equal(getautocombine['threshold'], 0)
+        assert_equal(getautocombine['frequency'], 30)
+
         walletinfo = self.nodes[0].getwalletinfo()
         assert_equal(walletinfo['autocombine_enabled'], False)
         assert_equal(walletinfo['autocombine_threshold'], 0)
+        assert_equal(walletinfo['autocombine_frequency'], 30)
 
         self.log.info("Mine 1 more block to make sure autocombine is disabled")
         self.nodes[0].generate(1)
@@ -96,8 +110,8 @@ def run_test(self):
         assert_equal(len(mempool), 0)
 
         walletinfo = self.nodes[0].getwalletinfo()
-        assert_equal(walletinfo['balance'], 250 + 250 + 750 - nFee)
-        assert_equal(walletinfo['txcount'], 106)
+        assert_equal(walletinfo['balance'], 250*12 - nFee)
+        assert_equal(walletinfo['txcount'], 113)
 
 
 if __name__ == '__main__':
