From 1c145b3c29d7e48fdab312ea4f5aa43e93534047 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 27 May 2019 13:53:17 -0400 Subject: [PATCH] scratchpad block commented; defined getDaemonConnection() --- CMakeLists.txt | 4 ++++ src/wallet/MoneroWallet.cpp | 4 ++++ src/wallet/MoneroWallet.h | 8 ++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd13584..1d31ffd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,6 +235,8 @@ set_target_properties(version PROPERTIES IMPORTED_LOCATION # Build C++ scratchpad ######################## +#[[ --- START BLOCK COMMENT --- + set( SCRATCHPAD_SRC_FILES test/Scratchpad.cpp @@ -286,6 +288,8 @@ target_link_libraries(scratchpad ${EXTRA_LIBRARIES} ) +]] # --- END BLOCK COMMENT --- + ######################## # Build c++ library ######################## diff --git a/src/wallet/MoneroWallet.cpp b/src/wallet/MoneroWallet.cpp index c2a01e3..b064ddd 100644 --- a/src/wallet/MoneroWallet.cpp +++ b/src/wallet/MoneroWallet.cpp @@ -58,6 +58,10 @@ void MoneroWallet::setDaemonConnection(const string& uri, const string& username wallet2->set_daemon(uri, login, isTrusted); } +MoneroRpcConnection MoneroWallet::getDaemonConnection() { + throw runtime_error("ready to implement getDaemonConnection()"); +} + MoneroNetworkType MoneroWallet::getNetworkType() { return static_cast(wallet2->nettype()); } diff --git a/src/wallet/MoneroWallet.h b/src/wallet/MoneroWallet.h index 20061e5..b09afc2 100644 --- a/src/wallet/MoneroWallet.h +++ b/src/wallet/MoneroWallet.h @@ -73,20 +73,20 @@ using namespace crypto; */ ~MoneroWallet(); - // ------------ WALLET METHODS SPECIFIC TO JNI IMPLEMENTATION --------------- - /** * Set the wallet's daemon connection. * + * TODO: switch to MoneroNetworkType + * * @param uri is the daemon's URI * @param username is the daemon's username * @param password is the daemon's password */ void setDaemonConnection(const string& uri, const string& username, const epee::wipeable_string& password); - MoneroNetworkType getNetworkType(); + MoneroRpcConnection getDaemonConnection(); - // -------------------------- COMMON WALLET METHODS ------------------------- + MoneroNetworkType getNetworkType(); // /** // * Get the wallet's seed.