zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Consistent parameter naming

This commit is contained in:
Jack Grigg 2016-08-12 14:37:17 +12:00
parent 0bfdb9628e
commit b5c06c83b0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtest/test_keystore.cpp
View File

@ -16,9 +16,9 @@ TEST(keystore_tests, store_and_retrieve_spending_key) {
auto addr = sk.address(); auto addr = sk.address();
ASSERT_TRUE(keyStore.HaveSpendingKey(addr)); ASSERT_TRUE(keyStore.HaveSpendingKey(addr));
libzcash::SpendingKey keyOut; libzcash::SpendingKey skOut;
keyStore.GetSpendingKey(addr, keyOut); keyStore.GetSpendingKey(addr, skOut);
ASSERT_EQ(sk, keyOut); ASSERT_EQ(sk, skOut);
keyStore.GetPaymentAddresses(addrs); keyStore.GetPaymentAddresses(addrs);
ASSERT_EQ(1, addrs.size()); ASSERT_EQ(1, addrs.size());

6
src/keystore.h
View File

@ -51,7 +51,7 @@ public:
//! Check whether a spending key corresponding to a given payment address is present in the store. //! Check whether a spending key corresponding to a given payment address is present in the store.
virtual bool HaveSpendingKey(const libzcash::PaymentAddress &address) const =0; virtual bool HaveSpendingKey(const libzcash::PaymentAddress &address) const =0;
virtual bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey& keyOut) const =0; virtual bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey& skOut) const =0;
virtual void GetPaymentAddresses(std::set<libzcash::PaymentAddress> &setAddress) const =0; virtual void GetPaymentAddresses(std::set<libzcash::PaymentAddress> &setAddress) const =0;
}; };
@ -125,14 +125,14 @@ public:
} }
return result; return result;
} }
bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey &keyOut) const bool GetSpendingKey(const libzcash::PaymentAddress &address, libzcash::SpendingKey &skOut) const
{ {
{ {
LOCK(cs_KeyStore); LOCK(cs_KeyStore);
SpendingKeyMap::const_iterator mi = mapSpendingKeys.find(address); SpendingKeyMap::const_iterator mi = mapSpendingKeys.find(address);
if (mi != mapSpendingKeys.end()) if (mi != mapSpendingKeys.end())
{ {
keyOut = mi->second; skOut = mi->second;
return true; return true;
} }
} }