diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-02 17:35:47 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-02 17:46:01 +0200 |
| commit | fecc1be23143476b981352e8516cf9cce0450d62 (patch) | |
| tree | 7fddddf7b4841918b025a4b855ea49870c523d1f /test/functional/feature_bip68_sequence.py | |
| parent | ccaef6c28b1997bd40faad2e1c66e22cdda11edc (diff) | |
| parent | 71d4eddf42eb5a15e434d2273f11d0a3942ef502 (diff) | |
Merge #16884: wallet: Change default address type to bech32
71d4eddf42eb5a15e434d2273f11d0a3942ef502 Add release note for bech32 by default in wallet (Gregory Sanders)
b34f0180e39fc95d88596a987724b994707e2552 Revert "gui: Generate bech32 addresses by default (take 2, fixup)" (Gregory Sanders)
f50785ab56c0c094960c7049cfe9209b101e2823 Change default address type to bech32 (Gregory Sanders)
Pull request description:
ACKs for top commit:
MarcoFalke:
re-ACK 71d4eddf42eb5a15e434d2273f11d0a3942ef502 (only change is restore mimick behavior)
laanwj:
ACK 71d4eddf42eb5a15e434d2273f11d0a3942ef502
Tree-SHA512: 3c49a1b51c49f3a762ad08985167ca1b89b0177ae20ab6d5883f1f74dde7a155921c1b855a842199bbf32f563c56b33f8b603bc842637bdcb121001023d454b6
Diffstat (limited to 'test/functional/feature_bip68_sequence.py')
| -rwxr-xr-x | test/functional/feature_bip68_sequence.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/functional/feature_bip68_sequence.py b/test/functional/feature_bip68_sequence.py index fe6f9eade1..677362756c 100755 --- a/test/functional/feature_bip68_sequence.py +++ b/test/functional/feature_bip68_sequence.py @@ -29,9 +29,10 @@ NOT_FINAL_ERROR = "non-BIP68-final (code 64)" class BIP68Test(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 + # TODO remove output type argument and fix resulting "tx-size-small" errors self.extra_args = [ - ["-acceptnonstdtxn=1"], - ["-acceptnonstdtxn=0"], + ["-acceptnonstdtxn=1", "-addresstype=p2sh-segwit"], + ["-acceptnonstdtxn=0", "-addresstype=p2sh-segwit"], ] def skip_test_if_missing_module(self): |