Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Adding block viewer to wallet.

Browse source
This commit is contained in:
clemahieu 2015-02-11 23:00:24 -06:00
commit 9f8ae5e711
3 changed files with 88 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

53
rai/qt/qt.cpp
View file

@ -187,6 +187,52 @@ void rai_qt::history::refresh ()
}
}
rai_qt::block_viewer::block_viewer (rai_qt::wallet & wallet_a) :
window (new QWidget),
layout (new QVBoxLayout),
hash_label (new QLabel ("Hash:")),
hash (new QLineEdit),
block_label (new QLabel ("Block:")),
block (new QPlainTextEdit),
retrieve (new QPushButton ("Retrieve")),
back (new QPushButton ("Back")),
wallet (wallet_a)
{
layout->addWidget (hash_label);
layout->addWidget (hash);
layout->addWidget (block_label);
layout->addWidget (block);
layout->addWidget (retrieve);
layout->addWidget (back);
window->setLayout (layout);
QObject::connect (back, &QPushButton::released, [this] ()
{
wallet.pop_main_stack ();
});
QObject::connect (retrieve, &QPushButton::released, [this] ()
{
rai::block_hash hash_l;
if (!hash_l.decode_hex (hash->text ().toStdString ()))
{
auto block_l (wallet.node.store.block_get (hash_l));
if (block_l != nullptr)
{
std::string contents;
block_l->serialize_json (contents);
block->setPlainText (contents.c_str ());
}
else
{
block->setPlainText ("Block not found");
}
}
else
{
block->setPlainText ("Bad block hash");
}
});
}
rai_qt::wallet::wallet (QApplication & application_a, rai::node & node_a, std::shared_ptr <rai::wallet> wallet_a, rai::account const & account_a) :
node (node_a),
wallet_m (wallet_a),
@ -199,6 +245,7 @@ enter_password (*this),
advanced (*this),
block_creation (*this),
block_entry (*this),
block_viewer (*this),
application (application_a),
status (new QLabel ("Status: Disconnected")),
main_stack (new QStackedWidget),
@ -523,6 +570,7 @@ search_for_receivables (new QPushButton ("Search for receivables")),
wallet_refresh (new QPushButton ("Refresh Wallet")),
create_block (new QPushButton ("Create Block")),
enter_block (new QPushButton ("Enter Block")),
block_viewer (new QPushButton ("Block Viewer")),
back (new QPushButton ("Back")),
ledger_window (new QWidget),
ledger_layout (new QVBoxLayout),
@ -570,6 +618,7 @@ wallet (wallet_a)
layout->addWidget (wallet_refresh);
layout->addWidget (create_block);
layout->addWidget (enter_block);
layout->addWidget (block_viewer);
layout->addStretch ();
layout->addWidget (back);
window->setLayout (layout);
@ -630,6 +679,10 @@ wallet (wallet_a)
{
wallet.push_main_stack (wallet.block_entry.window);
});
QObject::connect (block_viewer, &QPushButton::released, [this] ()
{
wallet.push_main_stack (wallet.block_viewer.window);
});
refresh_ledger ();
}

16
rai/qt/qt.hpp
View file

@ -54,6 +54,7 @@ namespace rai_qt {
QPushButton * wallet_refresh;
QPushButton * create_block;
QPushButton * enter_block;
QPushButton * block_viewer;
QPushButton * back;
QWidget * ledger_window;
@ -163,6 +164,20 @@ namespace rai_qt {
rai::ledger & ledger;
rai::account const & account;
};
class block_viewer
{
public:
block_viewer (rai_qt::wallet &);
QWidget * window;
QVBoxLayout * layout;
QLabel * hash_label;
QLineEdit * hash;
QLabel * block_label;
QPlainTextEdit * block;
QPushButton * retrieve;
QPushButton * back;
rai_qt::wallet & wallet;
};
enum class status
{
not_a_status,
@ -185,6 +200,7 @@ namespace rai_qt {
rai_qt::advanced_actions advanced;
rai_qt::block_creation block_creation;
rai_qt::block_entry block_entry;
rai_qt::block_viewer block_viewer;
QApplication & application;
QLabel * status;

19
rai/qt_test/qt.cpp
View file

@ -388,4 +388,23 @@ TEST (wallet, startup_work)
++iterations1;
ASSERT_LT (iterations1, 200);
}
}
TEST (wallet, block_viewer)
{
rai::keypair key;
rai::system system (24000, 1);
system.wallet (0)->store.insert (key.prv);
int argc (0);
QApplication application (argc, nullptr);
rai_qt::wallet wallet (application, *system.nodes [0], system.wallet (0), system.account (0));
QTest::mouseClick (wallet.show_advanced, Qt::LeftButton);
ASSERT_NE (-1, wallet.advanced.layout->indexOf (wallet.advanced.block_viewer));
QTest::mouseClick (wallet.advanced.block_viewer, Qt::LeftButton);
ASSERT_EQ (wallet.block_viewer.window, wallet.main_stack->currentWidget ());
QTest::keyClicks (wallet.block_viewer.hash, system.nodes [0]->ledger.latest (rai::genesis_account).to_string ().c_str ());
QTest::mouseClick (wallet.block_viewer.retrieve, Qt::LeftButton);
ASSERT_FALSE (wallet.block_viewer.block->toPlainText ().toStdString ().empty ());
QTest::mouseClick (wallet.block_viewer.back, Qt::LeftButton);
ASSERT_EQ (wallet.advanced.window, wallet.main_stack->currentWidget ());
}