Page MenuHomePhabricator
Files F13115834

D8260.id.diff
No OneTemporary
Actions

D8260.id.diff
View Options

diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py
--- a/test/functional/rpc_fundrawtransaction.py
+++ b/test/functional/rpc_fundrawtransaction.py
@@ -30,7 +30,9 @@
def set_test_params(self):
self.num_nodes = 4
self.setup_clean_chain = True
- self.extra_args = [[], [], [], []]
+ # This test isn't testing tx relay. Set whitelist on the peers for
+ # instant tx relay.
+ self.extra_args = [['-whitelist=127.0.0.1']] * self.num_nodes
def skip_test_if_missing_module(self):
self.skip_if_no_wallet()
@@ -492,8 +494,7 @@
# Send 1.2 BCH to msig addr.
self.nodes[0].sendtoaddress(mSigObj, 1.2)
- self.sync_all()
- self.nodes[1].generate(1)
+ self.nodes[0].generate(1)
self.sync_all()
oldBalance = self.nodes[1].getbalance()
@@ -504,8 +505,7 @@
signedTx = self.nodes[2].signrawtransactionwithwallet(fundedTx['hex'])
self.nodes[2].sendrawtransaction(signedTx['hex'])
- self.sync_all()
- self.nodes[1].generate(1)
+ self.nodes[2].generate(1)
self.sync_all()
# Make sure funds are received at node1.
@@ -516,23 +516,6 @@
self.log.info("Test fundrawtxn with locked wallet")
self.nodes[1].encryptwallet("test")
- self.stop_nodes()
-
- self.start_nodes()
- # This test is not meant to test fee estimation and we'd like
- # to be sure all txns are sent at a consistent desired feerate.
- for node in self.nodes:
- node.settxfee(self.min_relay_tx_fee)
-
- connect_nodes(self.nodes[0], self.nodes[1])
- connect_nodes(self.nodes[1], self.nodes[2])
- connect_nodes(self.nodes[0], self.nodes[2])
- connect_nodes(self.nodes[0], self.nodes[3])
- # Again lock the watchonly UTXO or nodes[0] may spend it, because
- # lockunspent is memory-only and thus lost on restart.
- self.nodes[0].lockunspent(
- False, [{"txid": self.watchonly_txid, "vout": self.watchonly_vout}])
- self.sync_all()
# Drain the keypool.
self.nodes[1].getnewaddress()
@@ -579,8 +562,7 @@
# Empty node1, send some small coins from node0 to node1.
self.nodes[1].sendtoaddress(
self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True)
- self.sync_all()
- self.nodes[0].generate(1)
+ self.nodes[1].generate(1)
self.sync_all()
for i in range(0, 20):
@@ -611,8 +593,7 @@
# Again, empty node1, send some small coins from node0 to node1.
self.nodes[1].sendtoaddress(
self.nodes[0].getnewaddress(), self.nodes[1].getbalance(), "", "", True)
- self.sync_all()
- self.nodes[0].generate(1)
+ self.nodes[1].generate(1)
self.sync_all()
for i in range(0, 20):
@@ -631,8 +612,7 @@
fundedAndSignedTx = self.nodes[1].signrawtransactionwithwallet(
fundedTx['hex'])
self.nodes[1].sendrawtransaction(fundedAndSignedTx['hex'])
- self.sync_all()
- self.nodes[0].generate(1)
+ self.nodes[1].generate(1)
self.sync_all()
assert_equal(oldBalance + Decimal('50.19000000'),
self.nodes[0].getbalance()) # 0.19+block reward

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 12:13 (6 m, 13 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5186194
Default Alt Text
D8260.id.diff (3 KB)

Event Timeline