fixup! feature_discount_ct: some txs can return 2 different weights, adapt the test to it

Author: delta1

test/functional/feature_discount_ct.py

@@ -6,6 +6,7 @@
 from decimal import Decimal
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.util import (
+    assert_approx,
     assert_equal,
 )
 
@@ -81,14 +82,10 @@ def run_test(self):
         assert_equal(tx['fee']['bitcoin'], Decimal('-0.00000326'))
         assert_equal(decoded['vsize'], 326)
         # tx weight can be 1301 or 1302, accept both
-        if decoded['weight'] == 1301:
-            expectedweight = 1301
-        else:
-            expectedweight = 1302
-        assert_equal(decoded['weight'], expectedweight)
+        assert_approx(decoded['weight'], 1301, 1)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_equal(tx['discountweight'], expectedweight)
+        assert_approx(tx['discountweight'], 1301, 1)
         assert_equal(tx['discountvsize'], 326)
 
         self.log.info("Send confidential tx to node 0")
@@ -104,16 +101,10 @@ def run_test(self):
         assert_equal(tx['fee']['bitcoin'], Decimal('-0.00002575'))
         assert_equal(decoded['vsize'], 2575)
         # tx weight can be 10299 or 10300, accept both
-        if decoded['weight'] == 10299:
-            expectedweight = 10299
-            expecteddiscountweight = 1301
-        else:
-            expectedweight = 10300
-            expecteddiscountweight = 1302
-        assert_equal(decoded['weight'], expectedweight)
+        assert_approx(decoded['weight'], 10299, 1)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_equal(tx['discountweight'], expecteddiscountweight)
+        assert_approx(tx['discountweight'], 1301, 1)
         assert_equal(tx['discountvsize'], 326) # node1 has discountvsize
 
         self.log.info("Send explicit tx to node 1")
@@ -129,14 +120,10 @@ def run_test(self):
         assert_equal(tx['fee']['bitcoin'], Decimal('-0.00000326'))
         assert_equal(decoded['vsize'], 326)
         # tx weight can be 1301 or 1302, accept both
-        if decoded['weight'] == 1301:
-            expectedweight = 1301
-        else:
-            expectedweight = 1302
-        assert_equal(decoded['weight'], expectedweight)
+        assert_approx(decoded['weight'], 1301, 1)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_equal(tx['discountweight'], expectedweight)
+        assert_approx(tx['discountweight'], 1301, 1)
         assert_equal(tx['discountvsize'], 326)
 
         self.log.info("Send confidential (undiscounted) tx to node 1")
@@ -152,16 +139,10 @@ def run_test(self):
         assert_equal(tx['fee']['bitcoin'], Decimal('-0.00002575'))
         assert_equal(decoded['vsize'], 2575)
         # tx weight can be 10299 or 10300, accept both
-        if decoded['weight'] == 10299:
-            expectedweight = 10299
-            expecteddiscountweight = 1301
-        else:
-            expectedweight = 10300
-            expecteddiscountweight = 1302
-        assert_equal(decoded['weight'], expectedweight)
+        assert_approx(decoded['weight'], 10299, 1)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_equal(tx['discountweight'], expecteddiscountweight)
+        assert_approx(tx['discountweight'], 1301, 1)
         assert_equal(tx['discountvsize'], 326) # node1 has discountvsize
 
         self.log.info("Send confidential (discounted) tx to node 1")
@@ -186,14 +167,8 @@ def run_test(self):
                 assert_equal(decoded['fee'][bitcoin], Decimal('0.00000326'))
             assert_equal(decoded['vsize'], 2575)
             # tx weight can be 10299 or 10300, accept both
-            if decoded['weight'] == 10299:
-                expectedweight = 10299
-                expecteddiscountweight = 1301
-            else:
-                expectedweight = 10300
-                expecteddiscountweight = 1302
-            assert_equal(decoded['weight'], expectedweight)
-            assert_equal(decoded['discountweight'], expecteddiscountweight)
+            assert_approx(decoded['weight'], 10299, 1)
+            assert_approx(decoded['discountweight'], 1301, 1)
             assert_equal(decoded['discountvsize'], 326)
 
         # node0 only has vsize
@@ -223,14 +198,8 @@ def run_test(self):
                 assert_equal(decoded['fee'][bitcoin], Decimal('0.00000033'))
             assert_equal(decoded['vsize'], 2575)
             # tx weight can be 10299 or 10300, accept both
-            if decoded['weight'] == 10299:
-                expectedweight = 10299
-                expecteddiscountweight = 1301
-            else:
-                expectedweight = 10300
-                expecteddiscountweight = 1302
-            assert_equal(decoded['weight'], expectedweight)
-            assert_equal(decoded['discountweight'], expecteddiscountweight)
+            assert_approx(decoded['weight'], 10299, 1)
+            assert_approx(decoded['discountweight'], 1301, 1)
             assert_equal(decoded['discountvsize'], 326)
         # node0 only has vsize
         tx = node0.getrawtransaction(txid, True)