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

Author: psgreco

test/functional/feature_discount_ct.py

@@ -82,10 +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
-        assert_approx(decoded['weight'], 1301, 1)
+        assert_approx(decoded['weight'], 1301.5, 0.5)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_approx(tx['discountweight'], 1301, 1)
+        assert_approx(tx['discountweight'], 1301.5, 0.5)
         assert_equal(tx['discountvsize'], 326)
 
         self.log.info("Send confidential tx to node 0")
@@ -101,10 +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
-        assert_approx(decoded['weight'], 10299, 1)
+        assert_approx(decoded['weight'], 10299.5, 0.5)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_approx(tx['discountweight'], 1301, 1)
+        assert_approx(tx['discountweight'], 1301.5, 0.5)
         assert_equal(tx['discountvsize'], 326) # node1 has discountvsize
 
         self.log.info("Send explicit tx to node 1")
@@ -120,10 +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
-        assert_approx(decoded['weight'], 1301, 1)
+        assert_approx(decoded['weight'], 1301.5, 0.5)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_approx(tx['discountweight'], 1301, 1)
+        assert_approx(tx['discountweight'], 1301.5, 0.5)
         assert_equal(tx['discountvsize'], 326)
 
         self.log.info("Send confidential (undiscounted) tx to node 1")
@@ -139,10 +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
-        assert_approx(decoded['weight'], 10299, 1)
+        assert_approx(decoded['weight'], 10299.5, 0.5)
         self.generate(node0, 1)
         tx = node1.getrawtransaction(txid, True)
-        assert_approx(tx['discountweight'], 1301, 1)
+        assert_approx(tx['discountweight'], 1301.5, 0.5)
         assert_equal(tx['discountvsize'], 326) # node1 has discountvsize
 
         self.log.info("Send confidential (discounted) tx to node 1")
@@ -167,8 +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
-            assert_approx(decoded['weight'], 10299, 1)
-            assert_approx(decoded['discountweight'], 1301, 1)
+            assert_approx(decoded['weight'], 10299.5, 0.5)
+            assert_approx(decoded['discountweight'], 1301.5, 0.5)
             assert_equal(decoded['discountvsize'], 326)
 
         # node0 only has vsize
@@ -198,8 +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
-            assert_approx(decoded['weight'], 10299, 1)
-            assert_approx(decoded['discountweight'], 1301, 1)
+            assert_approx(decoded['weight'], 10299.5, 0.5)
+            assert_approx(decoded['discountweight'], 1301.5, 0.5)
             assert_equal(decoded['discountvsize'], 326)
         # node0 only has vsize
         tx = node0.getrawtransaction(txid, True)