diff options
| author | MarcoFalke <[email protected]> | 2018-02-10 21:06:35 -0500 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-03-17 16:10:01 -0400 |
| commit | fab8a6f609d15863545955d6523c616c2a97eeab (patch) | |
| tree | a6ec9f9c5572e341ac150f470ed7dc24accfae28 /src/qt/test/wallettests.cpp | |
| parent | Merge #12683: Fix more constness violations in serialization code (diff) | |
| download | discoin-fab8a6f609d15863545955d6523c616c2a97eeab.tar.xz discoin-fab8a6f609d15863545955d6523c616c2a97eeab.zip | |
wallet: Change output type globals to members
Diffstat (limited to 'src/qt/test/wallettests.cpp')
| -rw-r--r-- | src/qt/test/wallettests.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index 976aadc0a..c9898e52c 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -150,9 +150,6 @@ void BumpFee(TransactionView& view, const uint256& txid, bool expectDisabled, st // src/qt/test/test_bitcoin-qt -platform cocoa # macOS void TestGUI() { - g_address_type = OUTPUT_TYPE_P2SH_SEGWIT; - g_change_type = OUTPUT_TYPE_P2SH_SEGWIT; - // Set up wallet and chain with 105 blocks (5 mature blocks for spending). TestChain100Setup test; for (int i = 0; i < 5; ++i) { @@ -163,7 +160,7 @@ void TestGUI() wallet.LoadWallet(firstRun); { LOCK(wallet.cs_wallet); - wallet.SetAddressBook(GetDestinationForKey(test.coinbaseKey.GetPubKey(), g_address_type), "", "receive"); + wallet.SetAddressBook(GetDestinationForKey(test.coinbaseKey.GetPubKey(), wallet.m_default_address_type), "", "receive"); wallet.AddKeyPubKey(test.coinbaseKey, test.coinbaseKey.GetPubKey()); } { |