-
Notifications
You must be signed in to change notification settings - Fork 35.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
wallet encapsulation #2130
wallet encapsulation #2130
Conversation
CWallet::GetAccountAddresses()
return SetAddressBookName(dest, strAccount); | ||
} | ||
|
||
bool CWallet::IsMine(const CBitcoinAddress& address) const |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here's still a CBitcoinAddress left.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I need to hunt that one down yet since I think it's used outside of rpc*.cpp. I'll post a new commit working on that soon.
CWallet::IsMine(CTxDestination&)
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/943e7768f33a7c766d1be5db8aea64a46e37253b for binaries and test log. |
|
||
pwalletMain->SetAddressBookName(address.Get(), strAccount); | ||
|
||
// TODO: Use the return code for something |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this a TODO?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I saw a method returning bool and the return value being ignored, so I put in that note. Looking around the codebase now I see that it's hardly ever used, so maybe it can be ignored. Want a new commit?
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. |
Okay, I stripped out the todos. Should I squash everything in this branch down to one commit in order to get it pulled? (total git noob here) |
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/4debb8059a3d29a88b72b2bc61a4e0f6bfc7e522 for binaries and test log. |
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 |
Rebase needed |
Poke @mikegogulski The general sentiment towards these changes seems positive. Let's rebase and get this moving, or close. |
I've rebased this as my mikegogulski_walletencap3 branch. It does, however, create a dependency from wallet.cpp -> main.h; I don't see any obvious way to fix this, considering that IsFinalTx is not tied to any class. |
Closing - non-responsive. Feel free to rebase and reopen. |
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.