Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 17:29:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8450

Browse Source 
600de07 wallet_rpc_server: longer timeout for stop_mining (moneromooo-monero)
ac6db92 functional_tests: silence the cpu power test program (moneromooo-monero)
This commit is contained in:
luigi1111 2022-08-22 22:47:45 -05:00
commit 77053298ed
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet_rpc_server.cpp
View File

@ -3254,7 +3254,7 @@ namespace tools
if (!m_wallet) return not_open(er); if (!m_wallet) return not_open(er);
cryptonote::COMMAND_RPC_STOP_MINING::request daemon_req; cryptonote::COMMAND_RPC_STOP_MINING::request daemon_req;
cryptonote::COMMAND_RPC_STOP_MINING::response daemon_res; cryptonote::COMMAND_RPC_STOP_MINING::response daemon_res;
bool r = m_wallet->invoke_http_json("/stop_mining", daemon_req, daemon_res); bool r = m_wallet->invoke_http_json("/stop_mining", daemon_req, daemon_res, std::chrono::seconds(60)); // this waits till stopped, and if randomx has just started initializing its dataset, it might be a while
if (!r || daemon_res.status != CORE_RPC_STATUS_OK) if (!r || daemon_res.status != CORE_RPC_STATUS_OK)
{ {
er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR; er.code = WALLET_RPC_ERROR_CODE_UNKNOWN_ERROR;

2
tests/functional_tests/functional_tests_rpc.py
View File

@ -97,6 +97,8 @@ try:
os.environ['MAKE_TEST_SIGNATURE'] = FUNCTIONAL_TESTS_DIRECTORY + '/make_test_signature' os.environ['MAKE_TEST_SIGNATURE'] = FUNCTIONAL_TESTS_DIRECTORY + '/make_test_signature'
os.environ['SEEDHASH_EPOCH_BLOCKS'] = "8" os.environ['SEEDHASH_EPOCH_BLOCKS'] = "8"
os.environ['SEEDHASH_EPOCH_LAG'] = "4" os.environ['SEEDHASH_EPOCH_LAG'] = "4"
if not 'MINING_SILENT' in os.environ:
os.environ['MINING_SILENT'] = "1"
for i in range(len(command_lines)): for i in range(len(command_lines)):
#print('Running: ' + str(command_lines[i])) #print('Running: ' + str(command_lines[i]))

4
tests/functional_tests/mining.py
View File

@ -221,7 +221,7 @@ class MiningTest():
available_ram = util_resources.available_ram_gb() available_ram = util_resources.available_ram_gb()
threshold_ram = 3 threshold_ram = 3
self.print_mining_info("Available RAM = " + str(round(available_ram, 1)) + " GB") self.print_mining_info("Available RAM = " + str(round(available_ram, 1)) + " GB")
if available_ram < threshold_ram: if available_ram < threshold_ram and not self.is_mining_silent():
print("Warning! Available RAM =", round(available_ram, 1), print("Warning! Available RAM =", round(available_ram, 1),
"GB is less than the reasonable threshold =", threshold_ram, "GB is less than the reasonable threshold =", threshold_ram,
". The RX init might exceed the calculated timeout.") ". The RX init might exceed the calculated timeout.")
@ -255,7 +255,7 @@ class MiningTest():
assert res.hash == block_hash assert res.hash == block_hash
def is_mining_silent(self): def is_mining_silent(self):
return 'MINING_SILENT' in os.environ return 'MINING_SILENT' in os.environ and os.environ['MINING_SILENT'] != "0"
def print_mining_info(self, msg): def print_mining_info(self, msg):
if self.is_mining_silent(): if self.is_mining_silent():