fixup! Rename account to label where appropriate

ryanofsky · ryanofsky · commit 603759b773db · 2017-10-21T12:21:29.000-04:00
Revert CAccount rename as suggested #11536 (comment)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -811,21 +811,21 @@ bool CWallet::AccountMove(std::string strFrom, std::string strTo, CAmount nAmoun
     return true;
 }
 
-bool CWallet::GetLabelPubkey(CPubKey &pubKey, std::string label_name, bool bForceNew)
+bool CWallet::GetLabelPubkey(CPubKey &pubKey, std::string label, bool bForceNew)
 {
     CWalletDB walletdb(*dbw);
 
-    CLabel label;
-    walletdb.ReadLabel(label_name, label);
+    CAccount account;
+    walletdb.ReadAccount(label, account);
 
     if (!bForceNew) {
-        if (!label.vchPubKey.IsValid())
+        if (!account.vchPubKey.IsValid())
             bForceNew = true;
         else {
             // Check if the current key has been used
-            CScript scriptPubKey = GetScriptForDestination(label.vchPubKey.GetID());
+            CScript scriptPubKey = GetScriptForDestination(account.vchPubKey.GetID());
             for (std::map<uint256, CWalletTx>::iterator it = mapWallet.begin();
-                 it != mapWallet.end() && label.vchPubKey.IsValid();
+                 it != mapWallet.end() && account.vchPubKey.IsValid();
                  ++it)
                 for (const CTxOut& txout : (*it).second.tx->vout)
                     if (txout.scriptPubKey == scriptPubKey) {
@@ -837,14 +837,14 @@ bool CWallet::GetLabelPubkey(CPubKey &pubKey, std::string label_name, bool bForc
 
     // Generate a new key
     if (bForceNew) {
-        if (!GetKeyFromPool(label.vchPubKey, false))
+        if (!GetKeyFromPool(account.vchPubKey, false))
             return false;
 
-        SetAddressBook(label.vchPubKey.GetID(), label_name, "receive");
-        walletdb.WriteLabel(label_name, label);
+        SetAddressBook(account.vchPubKey.GetID(), label, "receive");
+        walletdb.WriteAccount(label, account);
     }
 
-    pubKey = label.vchPubKey;
+    pubKey = account.vchPubKey;
 
     return true;
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -1141,15 +1141,15 @@ class CReserveKey final : public CReserveScript
 
 
 /** 
- * Label information.
- * Stored in wallet with key "acc"+string label name.
+ * Account information.
+ * Stored in wallet with key "acc"+string account name.
  */
-class CLabel
+class CAccount
 {
 public:
     CPubKey vchPubKey;
 
-    CLabel()
+    CAccount()
     {
         SetNull();
     }
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -150,15 +150,15 @@ bool CWalletDB::WriteMinVersion(int nVersion)
     return WriteIC(std::string("minversion"), nVersion);
 }
 
-bool CWalletDB::ReadLabel(const std::string& label_name, CLabel& label)
+bool CWalletDB::ReadAccount(const std::string& strAccount, CAccount& account)
 {
-    label.SetNull();
-    return batch.Read(std::make_pair(std::string("acc"), label_name), label);
+    account.SetNull();
+    return batch.Read(std::make_pair(std::string("acc"), strAccount), account);
 }
 
-bool CWalletDB::WriteLabel(const std::string& label_name, const CLabel& label)
+bool CWalletDB::WriteAccount(const std::string& strAccount, const CAccount& account)
 {
-    return WriteIC(std::make_pair(std::string("acc"), label_name), label);
+    return WriteIC(std::make_pair(std::string("acc"), strAccount), account);
 }
 
 bool CWalletDB::WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry)
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -34,7 +34,7 @@
 
 static const bool DEFAULT_FLUSHWALLET = true;
 
-class CLabel;
+class CAccount;
 class CAccountingEntry;
 struct CBlockLocator;
 class CKeyPool;
@@ -202,8 +202,8 @@ class CWalletDB
     /// This writes directly to the database, and will not update the CWallet's cached accounting entries!
     /// Use wallet.AddAccountingEntry instead, to write *and* update its caches.
     bool WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry);
-    bool ReadLabel(const std::string& label_name, CLabel& label);
-    bool WriteLabel(const std::string& label_name, const CLabel& label);
+    bool ReadAccount(const std::string& strAccount, CAccount& account);
+    bool WriteAccount(const std::string& strAccount, const CAccount& account);
 
     /// Write destination data key,value tuple to database
     bool WriteDestData(const std::string &address, const std::string &key, const std::string &value);

Original file line number	Diff line number	Diff line change
`@@ -1141,15 +1141,15 @@ class CReserveKey final : public CReserveScript`
`1141`	`1141`
`1142`	`1142`
`1143`	`1143`	`/**`
`1144`		`- * Label information.`
`1145`		`- * Stored in wallet with key "acc"+string label name.`
	`1144`	`+ * Account information.`
	`1145`	`+ * Stored in wallet with key "acc"+string account name.`
`1146`	`1146`	`*/`
`1147`		`-class CLabel`
	`1147`	`+class CAccount`
`1148`	`1148`	`{`
`1149`	`1149`	`public:`
`1150`	`1150`	`CPubKey vchPubKey;`
`1151`	`1151`
`1152`		`- CLabel()`
	`1152`	`+ CAccount()`
`1153`	`1153`	`{`
`1154`	`1154`	`SetNull();`
`1155`	`1155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,15 +150,15 @@ bool CWalletDB::WriteMinVersion(int nVersion)`
`150`	`150`	`return WriteIC(std::string("minversion"), nVersion);`
`151`	`151`	`}`
`152`	`152`
`153`		`-bool CWalletDB::ReadLabel(const std::string& label_name, CLabel& label)`
	`153`	`+bool CWalletDB::ReadAccount(const std::string& strAccount, CAccount& account)`
`154`	`154`	`{`
`155`		`- label.SetNull();`
`156`		`- return batch.Read(std::make_pair(std::string("acc"), label_name), label);`
	`155`	`+ account.SetNull();`
	`156`	`+ return batch.Read(std::make_pair(std::string("acc"), strAccount), account);`
`157`	`157`	`}`
`158`	`158`
`159`		`-bool CWalletDB::WriteLabel(const std::string& label_name, const CLabel& label)`
	`159`	`+bool CWalletDB::WriteAccount(const std::string& strAccount, const CAccount& account)`
`160`	`160`	`{`
`161`		`- return WriteIC(std::make_pair(std::string("acc"), label_name), label);`
	`161`	`+ return WriteIC(std::make_pair(std::string("acc"), strAccount), account);`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`bool CWalletDB::WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry)`