This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Prioritize accounts over address book #5909
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maciejhirsz
added
A0-pleasereview 🤓
rphmeier
reviewed
Jun 22, 2017
rpc/src/v1/impls/parity_accounts.rs
Outdated
| for (address, map) in account_iter { | ||
| match accounts.get(&address) { | ||
| // Skip if an account with UUID is already present. | ||
| Some(ref occupied) if occupied.uuid.is_some() => continue, |
There was a problem hiding this comment.
Entry API could be used here to coalesce the "get or insert" logic, but I don't know if it would be cleaner...
rphmeier
added
A8-looksgood 🦄
|
build failing. |
gavofyork
added
A7-looksgoodtestsfail 🤖
maciejhirsz
force-pushed
the
mh-always-show-accounts
branch
from
acfa3d8 to
2c254e3
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If a user creates an entry in the address book, and later tries to import an account that produces the same address, the account never shows up in the UI, no error is presented.
The account actually does get created, but since
parity_allAccountsInforeturns a map, and the map is constructed such that the address book can overshadow actual accounts. This is a not-so-elegant solution that guarantees that accounts always take precedence over address book.Also replaced
BTreeMap<String, String>with a dedicated struct.