Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 'pushKV ambiguous' error in compilation #15

Merged
merged 1 commit into from
Aug 30, 2021
Merged

Fix 'pushKV ambiguous' error in compilation #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2791,7 +2791,7 @@ bool CConnman::RemoveAddedNode(const std::string& strNode)
return false;
}

size_t CConnman::GetNodeCount(ConnectionDirection flags) const
uint64_t CConnman::GetNodeCount(ConnectionDirection flags) const
{
LOCK(cs_vNodes);
if (flags == ConnectionDirection::Both) // Shortcut if we want total
Expand Down
2 changes: 1 addition & 1 deletion src/net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ class CConnman
*/
bool AddConnection(const std::string& address, ConnectionType conn_type);

size_t GetNodeCount(ConnectionDirection) const;
uint64_t GetNodeCount(ConnectionDirection) const;
void GetNodeStats(std::vector<CNodeStats>& vstats) const;
bool DisconnectNode(const std::string& node);
bool DisconnectNode(const CSubNet& subnet);
Expand Down
4 changes: 2 additions & 2 deletions src/wallet/rpcwallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2486,7 +2486,7 @@ static RPCHelpMan getinfo()

UniValue obj(UniValue::VOBJ);

size_t kpExternalSize = pwallet->KeypoolCountExternalKeys();
uint64_t kpExternalSize = pwallet->KeypoolCountExternalKeys();
const auto bal = pwallet->GetBalance();
int64_t kp_oldest = pwallet->GetOldestKeyPoolTime();

Expand Down Expand Up @@ -2583,7 +2583,7 @@ static RPCHelpMan getwalletinfo()

UniValue obj(UniValue::VOBJ);

size_t kpExternalSize = pwallet->KeypoolCountExternalKeys();
uint64_t kpExternalSize = pwallet->KeypoolCountExternalKeys();
const auto bal = pwallet->GetBalance();
int64_t kp_oldest = pwallet->GetOldestKeyPoolTime();
obj.pushKV("walletname", pwallet->GetName());
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/scriptpubkeyman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ int64_t LegacyScriptPubKeyMan::GetOldestKeyPoolTime() const
return oldestKey;
}

size_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys() const
uint64_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys() const
{
LOCK(cs_KeyStore);
return setExternalKeyPool.size() + set_pre_split_keypool.size();
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/scriptpubkeyman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class LegacyScriptPubKeyMan : public ScriptPubKeyMan, public FillableSigningProv
void RewriteDB() override;

int64_t GetOldestKeyPoolTime() const override;
size_t KeypoolCountExternalKeys() const;
uint64_t KeypoolCountExternalKeys() const;
unsigned int GetKeyPoolSize() const override;

int64_t GetTimeFirstKey() const override;
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2098,7 +2098,7 @@ bool CWallet::DelAddressBook(const CTxDestination& address)
return batch.EraseName(EncodeDestination(address));
}

size_t CWallet::KeypoolCountExternalKeys() const
uint64_t CWallet::KeypoolCountExternalKeys() const
{
AssertLockHeld(cs_wallet);

Expand Down
2 changes: 1 addition & 1 deletion src/wallet/wallet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ class CWallet final : public WalletStorage, public interfaces::Chain::Notificati
/** Absolute maximum transaction fee (in satoshis) used by default for the wallet */
CAmount m_default_max_tx_fee{DEFAULT_TRANSACTION_MAXFEE};

size_t KeypoolCountExternalKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
uint64_t KeypoolCountExternalKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
bool TopUpKeyPool(unsigned int kpSize = 0);

int64_t GetOldestKeyPoolTime() const;
Expand Down