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/wallet_basic.py | |
| parent | ccaef6c28b1997bd40faad2e1c66e22cdda11edc (diff) | |
| parent | 71d4eddf42eb5a15e434d2273f11d0a3942ef502 (diff) | |
| download | bitcoin-fecc1be23143476b981352e8516cf9cce0450d62.tar.xz | |
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/wallet_basic.py')
| -rwxr-xr-x | test/functional/wallet_basic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py index 96ea5c9c35..550037923e 100755 --- a/test/functional/wallet_basic.py +++ b/test/functional/wallet_basic.py @@ -317,7 +317,7 @@ class WalletTest(BitcoinTestFramework): assert_raises_rpc_error(-5, "Invalid private key encoding", self.nodes[0].importprivkey, "invalid") # This will raise an exception for importing an address with the PS2H flag - temp_address = self.nodes[1].getnewaddress() + temp_address = self.nodes[1].getnewaddress("", "p2sh-segwit") assert_raises_rpc_error(-5, "Cannot use the p2sh flag with an address - use a script instead", self.nodes[0].importaddress, temp_address, "label", False, True) # This will raise an exception for attempting to dump the private key of an address you do not own |