From 2aab2713c10a3e7002b6c33a6ed0e91597f7f852 Mon Sep 17 00:00:00 2001 From: Sergey Kroshnin Date: Fri, 22 Feb 2019 12:53:37 +0300 Subject: [PATCH] Improve QT wallet.seed_work_generation test (#1732) --- nano/qt_test/qt.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/nano/qt_test/qt.cpp b/nano/qt_test/qt.cpp index d71a2996..33aa0e58 100644 --- a/nano/qt_test/qt.cpp +++ b/nano/qt_test/qt.cpp @@ -702,26 +702,23 @@ TEST (wallet, seed_work_generation) QTest::mouseClick (wallet->accounts.import_wallet, Qt::LeftButton); ASSERT_EQ (wallet->import.window, wallet->main_stack->currentWidget ()); nano::raw_key seed; - seed.data.clear (); + nano::uint256_union prv; + nano::deterministic_key (seed.data, 0, prv); + nano::uint256_union pub (nano::pub_key (prv)); QTest::keyClicks (wallet->import.seed, seed.data.to_string ().c_str ()); QTest::keyClicks (wallet->import.clear_line, "clear keys"); - uint64_t work_start; - { - auto transaction (system.wallet (0)->wallets.tx_begin ()); - system.wallet (0)->store.work_get (transaction, key1, work_start); - } - uint64_t work (work_start); + uint64_t work (0); QTest::mouseClick (wallet->import.import_seed, Qt::LeftButton); system.deadline_set (10s); - while (work == work_start) + while (work == 0) { auto ec = system.poll (); auto transaction (system.wallet (0)->wallets.tx_begin ()); - system.wallet (0)->store.work_get (transaction, key1, work); + system.wallet (0)->store.work_get (transaction, pub, work); ASSERT_NO_ERROR (ec); } auto transaction (system.nodes[0]->store.tx_begin ()); - ASSERT_FALSE (nano::work_validate (system.nodes[0]->ledger.latest_root (transaction, key1), work)); + ASSERT_FALSE (nano::work_validate (system.nodes[0]->ledger.latest_root (transaction, pub), work)); } TEST (wallet, backup_seed)