diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-06-23 16:16:54 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-06-23 17:02:52 -0400 |
commit | faa24441ec047ec336b86f586016b9d318c1c0ad (patch) | |
tree | 659d9cc2737a388a465b3c6b0543ec0b34dcba52 /test/functional/feature_cltv.py | |
parent | 6579d80572d2d33aceabbd3db45a6a9f809aa5e3 (diff) |
policy: Remove promiscuousmempoolflags
Diffstat (limited to 'test/functional/feature_cltv.py')
-rwxr-xr-x | test/functional/feature_cltv.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/functional/feature_cltv.py b/test/functional/feature_cltv.py index e9a8945e76..b0ea4ae6fe 100755 --- a/test/functional/feature_cltv.py +++ b/test/functional/feature_cltv.py @@ -62,7 +62,7 @@ def create_transaction(node, coinbase, to_address, amount): class BIP65Test(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.extra_args = [['-promiscuousmempoolflags=1', '-whitelist=127.0.0.1']] + self.extra_args = [['-whitelist=127.0.0.1']] self.setup_clean_chain = True def run_test(self): @@ -120,12 +120,13 @@ class BIP65Test(BitcoinTestFramework): spendtx.rehash() # First we show that this tx is valid except for CLTV by getting it - # accepted to the mempool (which we can achieve with - # -promiscuousmempoolflags). - self.nodes[0].p2p.send_and_ping(msg_tx(spendtx)) - assert spendtx.hash in self.nodes[0].getrawmempool() + # rejected from the mempool for exactly that reason. + assert_equal( + [{'txid': spendtx.hash, 'allowed': False, 'reject-reason': '64: non-mandatory-script-verify-flag (Negative locktime)'}], + self.nodes[0].testmempoolaccept(rawtxs=[bytes_to_hex_str(spendtx.serialize())], allowhighfees=True) + ) - # Now we verify that a block with this transaction is invalid. + # Now we verify that a block with this transaction is also invalid. block.vtx.append(spendtx) block.hashMerkleRoot = block.calc_merkle_root() block.solve() |