grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Swap order of addressbook & acocunts merge

Browse Source
This commit is contained in:
Jaco Greeff 2016-12-07 11:44:45 +01:00
parent be90245ecb
commit 21a3cf7b65
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/src/v1/impls/parity_accounts.rs
View File

@ -57,7 +57,7 @@ impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlock
let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e))); let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e)));
let other = store.addresses_info().expect("addresses_info always returns Ok; qed"); let other = store.addresses_info().expect("addresses_info always returns Ok; qed");
Ok(info.into_iter().chain(other.into_iter()).map(|(a, v)| { Ok(other.into_iter().chain(info.into_iter()).map(|(a, v)| {
let m = map![ let m = map![
"name".to_owned() => to_value(&v.name), "name".to_owned() => to_value(&v.name),
"meta".to_owned() => to_value(&v.meta), "meta".to_owned() => to_value(&v.meta),