From eabe10d3d9f219933645407c1b80b8c93eb4573c Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Fri, 29 Dec 2023 00:20:22 +0100 Subject: [PATCH] drop wallet_ptr from places where it isn't used --- libbridge/src/main/cpp/wallet2_api_c.cpp | 6 +++--- libbridge/src/main/cpp/wallet2_api_c.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libbridge/src/main/cpp/wallet2_api_c.cpp b/libbridge/src/main/cpp/wallet2_api_c.cpp index 22f310d..18a17c9 100644 --- a/libbridge/src/main/cpp/wallet2_api_c.cpp +++ b/libbridge/src/main/cpp/wallet2_api_c.cpp @@ -391,14 +391,14 @@ bool MONERO_WalletManager_closeWallet(void* wallet_ptr, bool store) { store); } -bool MONERO_WalletManager_walletExists(void* wallet_ptr, const char* path) { +bool MONERO_WalletManager_walletExists(const char* path) { return Monero::WalletManagerFactory::getWalletManager()->walletExists(std::string(path)); } -const char* MONERO_WalletManager_errorString(void* wallet_ptr) { +const char* MONERO_WalletManager_errorString() { return Monero::WalletManagerFactory::getWalletManager()->errorString().c_str(); } -void MONERO_WalletManager_setDaemonAddress(void* wallet_ptr, const char* address) { +void MONERO_WalletManager_setDaemonAddress(const char* address) { return Monero::WalletManagerFactory::getWalletManager()->setDaemonAddress(std::string(address)); } diff --git a/libbridge/src/main/cpp/wallet2_api_c.h b/libbridge/src/main/cpp/wallet2_api_c.h index c5f6a03..06206c7 100644 --- a/libbridge/src/main/cpp/wallet2_api_c.h +++ b/libbridge/src/main/cpp/wallet2_api_c.h @@ -662,14 +662,14 @@ void* MONERO_WalletManager_recoveryWallet(const char* path, const char* password // virtual bool closeWallet(Wallet *wallet, bool store = true) = 0; bool MONERO_WalletManager_closeWallet(void* wallet_ptr, bool store); // virtual bool walletExists(const std::string &path) = 0; -bool MONERO_WalletManager_walletExists(void* wallet_ptr, const char* path); +bool MONERO_WalletManager_walletExists(const char* path); // virtual bool verifyWalletPassword(const std::string &keys_file_name, const std::string &password, bool no_spend_key, uint64_t kdf_rounds = 1) const = 0; // virtual bool queryWalletDevice(Wallet::Device& device_type, const std::string &keys_file_name, const std::string &password, uint64_t kdf_rounds = 1) const = 0; // virtual std::vector findWallets(const std::string &path) = 0; // virtual std::string errorString() const = 0; -const char* MONERO_WalletManager_errorString(void* wallet_ptr); +const char* MONERO_WalletManager_errorString(); // virtual void setDaemonAddress(const std::string &address) = 0; -void MONERO_WalletManager_setDaemonAddress(void* wallet_ptr, const char* address); +void MONERO_WalletManager_setDaemonAddress(const char* address); // virtual bool connected(uint32_t *version = NULL) = 0; // virtual uint64_t blockchainHeight() = 0; // virtual uint64_t blockchainTargetHeight() = 0;