aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-01-19 22:07:56 -0500
committerAlex Morcos <morcos@chaincode.com>2017-03-03 16:50:19 -0500
commitf8380054442d8aca4999277fe7617067edf231b9 (patch)
tree4902b33ac7885e0445adace815b214d1f18e9ccc /qa
parentad727f4eaf1cb3ed7a0e340f690bd804299e698c (diff)
No longer allow "free" transactions
Remove -limitfreerelay and always enforce minRelayTxFee in the mempool (except from disconnected blocks) Remove -relaypriority, the option was only used for the ability to allow free transactions to be relayed regardless of their priority. Both notions no longer apply.
Diffstat (limited to 'qa')
-rwxr-xr-xqa/rpc-tests/abandonconflict.py1
-rwxr-xr-xqa/rpc-tests/smartfees.py3
2 files changed, 1 insertions, 3 deletions
diff --git a/qa/rpc-tests/abandonconflict.py b/qa/rpc-tests/abandonconflict.py
index b32d4e2ce0..5a860e4392 100755
--- a/qa/rpc-tests/abandonconflict.py
+++ b/qa/rpc-tests/abandonconflict.py
@@ -80,7 +80,6 @@ class AbandonConflictTest(BitcoinTestFramework):
# Restart the node with a higher min relay fee so the parent tx is no longer in mempool
# TODO: redo with eviction
- # Note had to make sure tx did not have AllowFree priority
stop_node(self.nodes[0],0)
self.nodes[0]=start_node(0, self.options.tmpdir, ["-debug","-logtimemicros","-minrelaytxfee=0.0001"])
diff --git a/qa/rpc-tests/smartfees.py b/qa/rpc-tests/smartfees.py
index 5a2b90767d..4289c7b0b6 100755
--- a/qa/rpc-tests/smartfees.py
+++ b/qa/rpc-tests/smartfees.py
@@ -188,8 +188,7 @@ class EstimateFeeTest(BitcoinTestFramework):
# Now we can connect the other nodes, didn't want to connect them earlier
# so the estimates would not be affected by the splitting transactions
- # Node1 mines small blocks but that are bigger than the expected transaction rate,
- # and allows free transactions.
+ # Node1 mines small blocks but that are bigger than the expected transaction rate.
# NOTE: the CreateNewBlock code starts counting block size at 1,000 bytes,
# (17k is room enough for 110 or so transactions)
self.nodes.append(start_node(1, self.options.tmpdir,