diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-17 13:20:21 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-01-18 10:24:18 +0100 |
| commit | cdf3e03a723b1a0242199672878caf1543ba8124 (patch) | |
| tree | d13952acf9acc384ebf0b89c0beb6e610d4a5556 /test/functional/segwit.py | |
| parent | c7978be899646194b6abc5b34a7f6a3311490033 (diff) | |
| download | bitcoin-cdf3e03a723b1a0242199672878caf1543ba8124.tar.xz | |
wallet: Deprecate addwitnessaddress
Now that segwit is natively supported by the wallet, deprecate the hack `addwitnessaddress`.
Diffstat (limited to 'test/functional/segwit.py')
| -rwxr-xr-x | test/functional/segwit.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/functional/segwit.py b/test/functional/segwit.py index 7d5c760ad9..67cca5f1e7 100755 --- a/test/functional/segwit.py +++ b/test/functional/segwit.py @@ -40,9 +40,9 @@ class SegWitTest(BitcoinTestFramework): self.setup_clean_chain = True self.num_nodes = 3 # This test tests SegWit both pre and post-activation, so use the normal BIP9 activation. - self.extra_args = [["-walletprematurewitness", "-rpcserialversion=0", "-vbparams=segwit:0:999999999999", "-addresstype=legacy"], - ["-blockversion=4", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness", "-rpcserialversion=1", "-vbparams=segwit:0:999999999999", "-addresstype=legacy"], - ["-blockversion=536870915", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness", "-vbparams=segwit:0:999999999999", "-addresstype=legacy"]] + self.extra_args = [["-walletprematurewitness", "-rpcserialversion=0", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"], + ["-blockversion=4", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness", "-rpcserialversion=1", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"], + ["-blockversion=536870915", "-promiscuousmempoolflags=517", "-prematurewitness", "-walletprematurewitness", "-vbparams=segwit:0:999999999999", "-addresstype=legacy", "-deprecatedrpc=addwitnessaddress"]] def setup_network(self): super().setup_network() |