Clarify *(--.end()) iterator semantics in CWallet::TopUpKeyPool

TheBlueMatt · TheBlueMatt · commit d40a72ccbb71 · 2017-07-14T21:25:24.000-04:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3141,10 +3141,10 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
             }
 
             if (!setInternalKeyPool.empty()) {
-                nEnd = *(--setInternalKeyPool.end()) + 1;
+                nEnd = *(setInternalKeyPool.rbegin()) + 1;
             }
             if (!setExternalKeyPool.empty()) {
-                nEnd = std::max(nEnd, *(--setExternalKeyPool.end()) + 1);
+                nEnd = std::max(nEnd, *(setExternalKeyPool.rbegin()) + 1);
             }
 
             if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey(internal), internal)))

Original file line number	Diff line number	Diff line change
`@@ -3141,10 +3141,10 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)`
`3141`	`3141`	`}`
`3142`	`3142`
`3143`	`3143`	`if (!setInternalKeyPool.empty()) {`
`3144`		`- nEnd = *(--setInternalKeyPool.end()) + 1;`
	`3144`	`+ nEnd = *(setInternalKeyPool.rbegin()) + 1;`
`3145`	`3145`	`}`
`3146`	`3146`	`if (!setExternalKeyPool.empty()) {`
`3147`		`- nEnd = std::max(nEnd, *(--setExternalKeyPool.end()) + 1);`
	`3147`	`+ nEnd = std::max(nEnd, *(setExternalKeyPool.rbegin()) + 1);`
`3148`	`3148`	`}`
`3149`	`3149`
`3150`	`3150`	`if (!walletdb.WritePool(nEnd, CKeyPool(GenerateNewKey(internal), internal)))`