diff options
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | src/debug_utilities/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/device/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/device/device.cpp | 9 | ||||
| -rw-r--r-- | src/wallet/api/wallet2_api.h | 2 | ||||
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile index 44a1015e9..b64af42ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN curl -s -L -o boost_${BOOST_VERSION}.tar.bz2 https://dl.bintray.com/boostor && tar -xvf boost_${BOOST_VERSION}.tar.bz2 \ && cd boost_${BOOST_VERSION} \ && ./bootstrap.sh \ - && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread threading=multi threadapi=pthread cflags="-fPIC" cxxflags="-fPIC" stage + && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale threading=multi threadapi=pthread cflags="-fPIC" cxxflags="-fPIC" stage ENV BOOST_ROOT /usr/local/boost_${BOOST_VERSION} # OpenSSL diff --git a/src/debug_utilities/CMakeLists.txt b/src/debug_utilities/CMakeLists.txt index 6942399e4..1bcbfd0cf 100644 --- a/src/debug_utilities/CMakeLists.txt +++ b/src/debug_utilities/CMakeLists.txt @@ -38,6 +38,8 @@ target_link_libraries(cn_deserialize LINK_PRIVATE cryptonote_core blockchain_db + device + ringct p2p epee ${CMAKE_THREAD_LIBS_INIT}) diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index 26389220f..7eccc1cc2 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -70,8 +70,6 @@ target_link_libraries(device cncrypto ringct ${OPENSSL_CRYPTO_LIBRARIES} - ${GNU_READLINE_LIBRARY} - ${EPEE_READLINE} PRIVATE ${Blocks} ${EXTRA_LIBRARIES}) diff --git a/src/device/device.cpp b/src/device/device.cpp index 080d83c7e..068529388 100644 --- a/src/device/device.cpp +++ b/src/device/device.cpp @@ -32,7 +32,7 @@ #ifdef HAVE_PCSC #include "device_ledger.hpp" #endif -#include "common/scoped_message_writer.h" +#include "misc_log_ex.h" namespace hw { @@ -56,12 +56,11 @@ namespace hw { auto device = devices.registry.find(device_descriptor); if (device == devices.registry.end()) { - auto logger = tools::fail_msg_writer(); - logger << "device not found in registry '"<<device_descriptor<<"'\n" << - "known devices:"<<device_descriptor<<"'"; + MERROR("device not found in registry: '" << device_descriptor << "'\n" << + "known devices:"); for( const auto& sm_pair : devices.registry ) { - logger<< " - " << sm_pair.first ; + MERROR(" - " << sm_pair.first); } throw std::runtime_error("device not found: "+ device_descriptor); } diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h index a6320545e..36b3b9c9b 100644 --- a/src/wallet/api/wallet2_api.h +++ b/src/wallet/api/wallet2_api.h @@ -541,7 +541,7 @@ struct Wallet static bool addressValid(const std::string &str, NetworkType nettype); static bool addressValid(const std::string &str, bool testnet) // deprecated { - return addressValid(str, testnet ? MAINNET : TESTNET); + return addressValid(str, testnet ? TESTNET : MAINNET); } static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, NetworkType nettype, std::string &error); static bool keyValid(const std::string &secret_key_string, const std::string &address_string, bool isViewKey, bool testnet, std::string &error) // deprecated diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index 5b6df8a9c..b03332f40 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -37,7 +37,7 @@ #include "common/updates.h" #include "version.h" #include "net/http_client.h" -#include "deviuce/device.hpp" +#include "device/device.hpp" #include <boost/filesystem.hpp> #include <boost/regex.hpp> |