Merge branch 'develop' into denny_fix_eth_relay_backing_tests

darwinia-network · Mar 10, 2020 · c84d73c · c84d73c
2 parents c974aac + 24d6317
commit c84d73c
Show file tree

Hide file tree

Showing 3 changed files with 671 additions and 612 deletions.
diff --git a/frame/balances/kton/src/lib.rs b/frame/balances/kton/src/lib.rs
@@ -285,10 +285,9 @@ decl_storage! {
 				)
 			}
 			for &(ref who, free_kton) in config.balances.iter() {
-				T::AccountStore::insert(who, AccountData {
-					free_kton,
-					..Default::default()
-				});
+				let mut account_data = T::AccountStore::get(who);
+				account_data.free_kton = free_kton;
+				T::AccountStore::insert(who, account_data);
 			}
 		});
 	}

diff --git a/frame/balances/ring/src/lib.rs b/frame/balances/ring/src/lib.rs
@@ -285,10 +285,9 @@ decl_storage! {
 				)
 			}
 			for &(ref who, free_ring) in config.balances.iter() {
-				T::AccountStore::insert(who, AccountData {
-					free_ring,
-					..Default::default()
-				});
+				let mut account_data = T::AccountStore::get(who);
+				account_data.free_ring = free_ring;
+				T::AccountStore::insert(who, account_data);
 			}
 		});
 	}