diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-20 12:41:02 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-20 12:53:45 +0200 |
| commit | 020c4073a03a69709ed6b33d10e163ab86d65f4f (patch) | |
| tree | 71e75f2864b636cbbd66347b1a7a8f7cec0076a1 /qa | |
| parent | ae69a75c554f98c82bd71775526dd0da0b84b4b5 (diff) | |
| parent | b6d5e32e0e5b038c6ff7e2ab5221b10727722341 (diff) | |
| download | bitcoin-020c4073a03a69709ed6b33d10e163ab86d65f4f.tar.xz | |
Merge pull request #6841
b6d5e32 Make fee aware of min relay in pruning.py RPC test (Alex Morcos)
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/pruning.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qa/rpc-tests/pruning.py b/qa/rpc-tests/pruning.py index 2824c51ce7..21f8d69382 100755 --- a/qa/rpc-tests/pruning.py +++ b/qa/rpc-tests/pruning.py @@ -61,6 +61,9 @@ class PruneTest(BitcoinTestFramework): self.address[0] = self.nodes[0].getnewaddress() self.address[1] = self.nodes[1].getnewaddress() + # Determine default relay fee + self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"] + connect_nodes(self.nodes[0], 1) connect_nodes(self.nodes[1], 2) connect_nodes(self.nodes[2], 0) @@ -239,7 +242,7 @@ class PruneTest(BitcoinTestFramework): outputs = {} t = self.utxo.pop() inputs.append({ "txid" : t["txid"], "vout" : t["vout"]}) - remchange = t["amount"] - Decimal("0.001000") + remchange = t["amount"] - 100*self.relayfee # Fee must be above min relay rate for 66kb tx outputs[address]=remchange # Create a basic transaction that will send change back to ourself after account for a fee # And then insert the 128 generated transaction outs in the middle rawtx[92] is where the # |