rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 17:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2824

Browse source 
51895fd7 split wallet and wallet_api (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-11-25 19:53:34 +02:00
commit 2e54e7ff0b
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
15 changed files with 104 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/wallet/CMakeLists.txt
View file

@ -33,21 +33,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(wallet_sources
wallet2.cpp
wallet_args.cpp
node_rpc_proxy.cpp
api/wallet.cpp
api/wallet_manager.cpp
api/transaction_info.cpp
api/transaction_history.cpp
api/pending_transaction.cpp
api/utils.cpp
api/address_book.cpp
api/subaddress.cpp
api/subaddress_account.cpp
api/unsigned_transaction.cpp)
set(wallet_api_headers
wallet2_api.h)
node_rpc_proxy.cpp)
set(wallet_private_headers
wallet2.h
@ -56,23 +42,12 @@ set(wallet_private_headers
wallet_rpc_server.h
wallet_rpc_server_commands_defs.h
wallet_rpc_server_error_codes.h
node_rpc_proxy.h
api/wallet.h
api/wallet_manager.h
api/transaction_info.h
api/transaction_history.h
api/pending_transaction.h
api/common_defines.h
api/address_book.h
api/subaddress.h
api/subaddress_account.h
api/unsigned_transaction.h)
node_rpc_proxy.h)
monero_private_headers(wallet
${wallet_private_headers})
monero_add_library(wallet
${wallet_sources}
${wallet_api_headers}
${wallet_private_headers})
target_link_libraries(wallet
PUBLIC
@ -127,6 +102,7 @@ install(TARGETS wallet_rpc_server DESTINATION bin)
# build and install libwallet_merged only if we building for GUI
if (BUILD_GUI_DEPS)
set(libs_to_merge
wallet_api
wallet
cryptonote_core
cryptonote_basic
@ -149,6 +125,5 @@ if (BUILD_GUI_DEPS)
install(TARGETS wallet_merged
ARCHIVE DESTINATION ${lib_folder})
install(FILES ${wallet_api_headers}
DESTINATION include/wallet)
add_subdirectory(api)
endif()

89
src/wallet/api/CMakeLists.txt Normal file
View file

@ -0,0 +1,89 @@
# Copyright (c) 2014-2017, The Monero Project
#
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without modification, are
# permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice, this list of
# conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright notice, this list
# of conditions and the following disclaimer in the documentation and/or other
# materials provided with the distribution.
#
# 3. Neither the name of the copyright holder nor the names of its contributors may be
# used to endorse or promote products derived from this software without specific
# prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# include (${PROJECT_SOURCE_DIR}/cmake/libutils.cmake)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(wallet_api_sources
wallet.cpp
wallet_manager.cpp
transaction_info.cpp
transaction_history.cpp
pending_transaction.cpp
utils.cpp
address_book.cpp
subaddress.cpp
subaddress_account.cpp
unsigned_transaction.cpp)
set(wallet_api_headers
wallet2_api.h)
set(wallet_api_private_headers
wallet.h
wallet_manager.h
transaction_info.h
transaction_history.h
pending_transaction.h
common_defines.h
address_book.h
subaddress.h
subaddress_account.h
unsigned_transaction.h)
monero_private_headers(wallet_api
${wallet_api_private_headers})
monero_add_library(wallet_api
${wallet_api_sources}
${wallet_api_headers}
${wallet_api_private_headers})
target_link_libraries(wallet_api
PUBLIC
wallet
common
cryptonote_core
mnemonics
${Boost_CHRONO_LIBRARY}
${Boost_SERIALIZATION_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${Boost_REGEX_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES})
if(IOS)
set(lib_folder lib-${ARCH})
else()
set(lib_folder lib)
endif()
install(FILES ${wallet_api_headers}
DESTINATION include/wallet)

2
src/wallet/api/address_book.h
View file

@ -28,7 +28,7 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include "wallet/wallet2.h"
namespace Monero {

2
src/wallet/api/pending_transaction.h
View file

@ -28,7 +28,7 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include "wallet/wallet2.h"
#include <string>

2
src/wallet/api/subaddress.h
View file

@ -26,7 +26,7 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include "wallet/wallet2.h"
namespace Monero {

2
src/wallet/api/subaddress_account.h
View file

@ -26,7 +26,7 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include "wallet/wallet2.h"
namespace Monero {

2
src/wallet/api/transaction_history.h
View file

@ -28,7 +28,7 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include <boost/thread/shared_mutex.hpp>
namespace Monero {

2
src/wallet/api/transaction_info.h
View file

@ -28,7 +28,7 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include <string>
#include <ctime>

2
src/wallet/api/unsigned_transaction.h
View file

@ -28,7 +28,7 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include "wallet/wallet2.h"
#include <string>

2
src/wallet/api/wallet.h
View file

@ -31,7 +31,7 @@
#ifndef WALLET_IMPL_H
#define WALLET_IMPL_H
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include "wallet/wallet2.h"
#include <string>

0
src/wallet/wallet2_api.h → src/wallet/api/wallet2_api.h
View file

2
src/wallet/api/wallet_manager.h
View file

@ -29,7 +29,7 @@
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include <string>
namespace Monero {

1
src/wallet/wallet2.cpp
View file

@ -39,7 +39,6 @@ using namespace epee;
#include "cryptonote_config.h"
#include "wallet2.h"
#include "wallet2_api.h"
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "rpc/core_rpc_server_commands_defs.h"
#include "misc_language.h"

1
tests/libwallet_api_tests/CMakeLists.txt
View file

@ -39,6 +39,7 @@ add_executable(libwallet_api_tests
target_link_libraries(libwallet_api_tests
PRIVATE
wallet_api
wallet
version
epee

2
tests/libwallet_api_tests/main.cpp
View file

@ -30,7 +30,7 @@
#include "gtest/gtest.h"
#include "wallet/wallet2_api.h"
#include "wallet/api/wallet2_api.h"
#include "wallet/wallet2.h"
#include "include_base_utils.h"
#include "common/util.h"