aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-09-18 17:31:35 +0200
committerRiccardo Spagni <ric@spagni.net>2018-09-18 17:31:35 +0200
commitb174527f1d7c9f352da3c849d62cc12ec1e0b92d (patch)
tree289160042cf83563bf572cfbfc3ac55bbf507dbc /tests
parentMerge pull request #4299 (diff)
parentapi/wallet: properly disable key encryption (diff)
downloadmonero-b174527f1d7c9f352da3c849d62cc12ec1e0b92d.tar.xz
Merge pull request #4302
ba8dd347 api/wallet: properly disable key encryption (stoffu)
Diffstat (limited to 'tests')
-rw-r--r--tests/functional_tests/transactions_flow_test.cpp4
-rw-r--r--tests/unit_tests/multisig.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/functional_tests/transactions_flow_test.cpp b/tests/functional_tests/transactions_flow_test.cpp
index 25dcc77bc..ffe500d21 100644
--- a/tests/functional_tests/transactions_flow_test.cpp
+++ b/tests/functional_tests/transactions_flow_test.cpp
@@ -138,7 +138,7 @@ bool transactions_flow_test(std::string& working_folder,
return false;
}
- w1.init(true, daemon_addr_a);
+ w1.init(daemon_addr_a);
uint64_t blocks_fetched = 0;
bool received_money;
@@ -149,7 +149,7 @@ bool transactions_flow_test(std::string& working_folder,
return false;
}
- w2.init(true, daemon_addr_b);
+ w2.init(daemon_addr_b);
MGINFO_GREEN("Using wallets: " << ENDL
<< "Source: " << w1.get_account().get_public_address_str(MAINNET) << ENDL << "Path: " << working_folder + "/" + path_source_wallet << ENDL
diff --git a/tests/unit_tests/multisig.cpp b/tests/unit_tests/multisig.cpp
index eb453b960..83924c7af 100644
--- a/tests/unit_tests/multisig.cpp
+++ b/tests/unit_tests/multisig.cpp
@@ -61,7 +61,7 @@ static void make_wallet(unsigned int idx, tools::wallet2 &wallet)
try
{
- wallet.init(false, "");
+ wallet.init("");
wallet.set_subaddress_lookahead(1, 1);
wallet.generate("", "", spendkey, true, false);
ASSERT_TRUE(test_addresses[idx].address == wallet.get_account().get_public_address_str(cryptonote::TESTNET));