diff options
author | luigi1111 <luigi1111w@gmail.com> | 2020-05-01 15:32:52 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2020-05-01 15:32:52 -0500 |
commit | c9b800a787cf2eba8803ddd03020e36d21c278b7 (patch) | |
tree | 1cedd9357896d95899a554f5ab3259d96275df92 /tests/trezor/daemon.cpp | |
parent | Merge pull request #6444 (diff) | |
parent | trezor: adapt to new passphrase mechanism (diff) | |
download | monero-c9b800a787cf2eba8803ddd03020e36d21c278b7.tar.xz |
Merge pull request #6446
e509ede trezor: adapt to new passphrase mechanism (ph4r05)
Diffstat (limited to 'tests/trezor/daemon.cpp')
-rw-r--r-- | tests/trezor/daemon.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/trezor/daemon.cpp b/tests/trezor/daemon.cpp index 41af93f3f..aba835ae2 100644 --- a/tests/trezor/daemon.cpp +++ b/tests/trezor/daemon.cpp @@ -129,7 +129,7 @@ void mock_daemon::init() m_rpc_server.nettype(m_network_type); CHECK_AND_ASSERT_THROW_MES(m_protocol.init(m_vm), "Failed to initialize cryptonote protocol."); - CHECK_AND_ASSERT_THROW_MES(m_rpc_server.init(m_vm, false, main_rpc_port), "Failed to initialize RPC server."); + CHECK_AND_ASSERT_THROW_MES(m_rpc_server.init(m_vm, false, main_rpc_port, false), "Failed to initialize RPC server."); if (m_start_p2p) CHECK_AND_ASSERT_THROW_MES(m_server.init(m_vm), "Failed to initialize p2p server."); @@ -313,7 +313,7 @@ void mock_daemon::mine_blocks(size_t num_blocks, const std::string &miner_addres { bool blocks_mined = false; const uint64_t start_height = get_height(); - const auto mining_timeout = std::chrono::seconds(30); + const auto mining_timeout = std::chrono::seconds(120); MDEBUG("Current height before mining: " << start_height); start_mining(miner_address); |