test: fix bug in wallet_groups.py functional test that was introduced in merge of bitcoin/bitcoin#22364 in 00f2e32

Author: jamesdorfman

test/functional/test_runner.py

@@ -208,9 +208,8 @@
     'rpc_signrawtransaction.py --descriptors',
     'rpc_rawtransaction.py --legacy-wallet',
     'rpc_rawtransaction.py --descriptors',
-    # ELEMENTS: FIXME failing tests
-    # 'wallet_groups.py --legacy-wallet',
-    # 'wallet_groups.py --descriptors',
+    'wallet_groups.py --legacy-wallet',
+    'wallet_groups.py --descriptors',
     'wallet_transactiontime_rescan.py --descriptors',
     'wallet_transactiontime_rescan.py --legacy-wallet',
     'p2p_addrv2_relay.py',

test/functional/wallet_groups.py

@@ -60,11 +60,6 @@ def run_test(self):
         # one output should be 0.2, the other should be ~0.3
         v = [vout["value"] for vout in tx1["vout"] if vout["scriptPubKey"]["type"] != "fee"]
         v.sort()
-        # JAMES/BYRON DELETE ME
-        #print(self.nodes[1].listunspent())
-        print("vin amount = {}".format(self.nodes[0].gettxout(tx1["vin"][0]["txid"], tx1["vin"][0]["vout"], True)["value"]))
-        print("vout amounts = {}".format(v))
-        # END JAMES?BYRON
         assert_approx(v[0], vexp=0.2, vspan=0.0001)
         assert_approx(v[1], vexp=0.3, vspan=0.0001)
 
@@ -114,10 +109,10 @@ def run_test(self):
         assert_equal(input_addrs[0], input_addrs[1])
         # Node 2 enforces avoidpartialspends so needs no checking here
 
-        tx4_ungrouped_fee = 2820
-        tx4_grouped_fee = 4160
-        tx5_6_ungrouped_fee = 5520
-        tx5_6_grouped_fee = 8240
+        tx4_ungrouped_fee = 5140
+        tx4_grouped_fee = 6520
+        tx5_6_ungrouped_fee = 7880
+        tx5_6_grouped_fee = 10620
 
         self.log.info("Test wallet option maxapsfee")
         addr_aps = self.nodes[3].getnewaddress()