changeset 3562:66ba6b87f085 draft

Merge pull request #1871 from jgarzik/wallet-deadcode walletdb.h: remove dead code
author Jeff Garzik <jgarzik@exmulti.com>
date Fri, 28 Sep 2012 17:05:16 -0700 (2012-09-29)
parents 134427db3533 (current diff) c77e5d5fe1dd (diff)
children 44c091144e84
files
diffstat 1 files changed, 0 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/src/walletdb.h
+++ b/src/walletdb.h
@@ -33,21 +33,10 @@
     CWalletDB(const CWalletDB&);
     void operator=(const CWalletDB&);
 public:
-    bool ReadName(const std::string& strAddress, std::string& strName)
-    {
-        strName = "";
-        return Read(std::make_pair(std::string("name"), strAddress), strName);
-    }
-
     bool WriteName(const std::string& strAddress, const std::string& strName);
 
     bool EraseName(const std::string& strAddress);
 
-    bool ReadTx(uint256 hash, CWalletTx& wtx)
-    {
-        return Read(std::make_pair(std::string("tx"), hash), wtx);
-    }
-
     bool WriteTx(uint256 hash, const CWalletTx& wtx)
     {
         nWalletDBUpdated++;
@@ -60,12 +49,6 @@
         return Erase(std::make_pair(std::string("tx"), hash));
     }
 
-    bool ReadKey(const CPubKey& vchPubKey, CPrivKey& vchPrivKey)
-    {
-        vchPrivKey.clear();
-        return Read(std::make_pair(std::string("key"), vchPubKey.Raw()), vchPrivKey);
-    }
-
     bool WriteKey(const CPubKey& vchPubKey, const CPrivKey& vchPrivKey)
     {
         nWalletDBUpdated++;
@@ -91,13 +74,6 @@
         return Write(std::make_pair(std::string("mkey"), nID), kMasterKey, true);
     }
 
-    // Support for BIP 0013 : see https://en.bitcoin.it/wiki/BIP_0013
-    bool ReadCScript(const uint160 &hash, CScript& redeemScript)
-    {
-        redeemScript.clear();
-        return Read(std::make_pair(std::string("cscript"), hash), redeemScript);
-    }
-
     bool WriteCScript(const uint160& hash, const CScript& redeemScript)
     {
         nWalletDBUpdated++;
@@ -121,12 +97,6 @@
         return Write(std::string("orderposnext"), nOrderPosNext);
     }
 
-    bool ReadDefaultKey(std::vector<unsigned char>& vchPubKey)
-    {
-        vchPubKey.clear();
-        return Read(std::string("defaultkey"), vchPubKey);
-    }
-
     bool WriteDefaultKey(const CPubKey& vchPubKey)
     {
         nWalletDBUpdated++;