From dd8c6b170386b64ae1d4344c7abd93d7b814a43b Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 19 Nov 2019 16:30:19 +0000 Subject: [PATCH] wallet: do not split integrated addresses in address book api --- src/simplewallet/simplewallet.cpp | 34 ++----- src/wallet/api/address_book.cpp | 54 +++-------- src/wallet/wallet2.cpp | 10 ++- src/wallet/wallet2.h | 35 ++++++-- src/wallet/wallet_rpc_server.cpp | 95 ++++---------------- src/wallet/wallet_rpc_server_commands_defs.h | 8 -- tests/functional_tests/address_book.py | 64 ++----------- tests/unit_tests/serialization.cpp | 1 - 8 files changed, 78 insertions(+), 223 deletions(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 87bbf62d3..d38673cdf 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -196,7 +196,7 @@ namespace " account tag_description "); const char* USAGE_ADDRESS("address [ new