Renamed merge_with into replace_with

ethcore/src/state/account.rs

@@ -394,7 +394,7 @@ impl Account {
 	/// Replace self with the data from other account merging storage cache.
 	/// Basic account data and all modifications are overwritten
 	/// with new values.
-	pub fn merge_with(&mut self, other: Account) {
+	pub fn replace_with(&mut self, other: Account) {
 		self.balance = other.balance;
 		self.nonce = other.nonce;
 		self.storage_root = other.storage_root;

ethcore/src/state/mod.rs

@@ -110,13 +110,13 @@ impl AccountEntry {
 	}
 
 	// Replace data with another entry but preserve storage cache
-	fn merge_snapshot(&mut self, other: AccountEntry) {
+	fn replace_with(&mut self, other: AccountEntry) {
 		self.state = other.state;
 		match other.account {
 			None => self.account = None,
 			Some(acc) => match self.account {
 				Some(ref mut ours) => {
-					ours.merge_with(acc);
+					ours.replace_with(acc);
 				},
 				None => {},
 			},
@@ -245,7 +245,7 @@ impl State {
 							Entry::Occupied(mut e) => {
 								// Merge snapshotted changes back into the main account
 								// storage preserving the cache.
-								e.get_mut().merge_snapshot(v);
+								e.get_mut().replace_with(v);
 							},
 							Entry::Vacant(e) => {
 								e.insert(v);

ethcore/src/state_db.rs

@@ -191,7 +191,7 @@ impl StateDB {
 		for (address, account) in self.cache_overlay.drain(..) {
 			if let Some(&mut Some(ref mut existing)) = cache.accounts.get_mut(&address) {
 				if let Some(new) = account {
-					existing.merge_with(new);
+					existing.replace_with(new);
 					continue;
 				}
 			}