hopefully a proper rebasing of #2075
The goal here is to work toward a clean interface to the wallet object. For now this involves moving code out of rpc*.cpp which deals with wallet internals and making that code into methods on the CWallet object.
hopefully a proper rebasing of #2075
The goal here is to work toward a clean interface to the wallet object. For now this involves moving code out of rpc*.cpp which deals with wallet internals and making that code into methods on the CWallet object.
CWallet::GetAccountAddresses()
CWallet::IsMine(CTxDestination&)
1857+ }
1858+
1859+ return SetAddressBookName(dest, strAccount);
1860+}
1861+
1862+bool CWallet::IsMine(const CBitcoinAddress& address) const
169- GetAccountAddress(strOldAccount, true);
170- }
171-
172- pwalletMain->SetAddressBookName(address.Get(), strAccount);
173-
174+ // TODO: Use the return code for something
Many of your TODO’s look like todo’s for yourself rather than concrete plans for changes in the source code - leave those out. If there is a concrete plan, and it’s obvious: just add a commit that actually implements the change. If it’s something big you’d rather leave for a follow-up pull request, a TODO in the code is fine.
Also, squash some commits together. “Indentation fix” certainly doesn’t require a separate commit.
Automatic sanity-testing: FAILED MERGE, see http://jenkins.bluematt.me/pull-tester/4debb8059a3d29a88b72b2bc61a4e0f6bfc7e522 for test log.
This pull does not merge cleanly onto current master
Poke @mikegogulski
The general sentiment towards these changes seems positive. Let’s rebase and get this moving, or close.