Fixing tests

ethcore/src/account_provider.rs

@@ -81,10 +81,11 @@ impl KeyDirectory for NullDir {
 	}
 
 	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, SSError> {
-		self.accounts.write()
+		let mut lock = self.accounts.write();
-			.entry(account.address.clone())
+		let mut accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
-			.or_insert_with(Vec::new)
+		// If the filename is the same we just need to replace the entry
-			.push(account.clone());
+		accounts.retain(|acc| acc.filename != account.filename);
+		accounts.push(account.clone());
 		Ok(account)
 	}
 

ethstore/src/ethstore.rs

@@ -220,6 +220,9 @@ impl EthMultiStore {
 		// update cache
 		let mut cache = self.cache.write();
 		let mut accounts = cache.entry(account.address.clone()).or_insert_with(Vec::new);
+		// TODO [ToDr] That is crappy way of overcoming set_name, set_meta, etc.
+		// Avoid cloning instead!
+		accounts.retain(|acc| acc.filename != account.filename);
 		accounts.push(account);
 		Ok(())
 	}

rpc/src/v1/types/confirmations.rs

@@ -267,7 +267,7 @@ mod tests {
 
 		// when
 		let res = serde_json::to_string(&response);
-		let expected = r#"{"result":"0x0000000000000000000000000000000000000000","token":"test-token"}"#;
+		let expected = r#"{"result":"0x0000000000000000000000000000000000000000000000000000000000000000","token":"test-token"}"#;
 
 		// then
 		assert_eq!(res.unwrap(), expected.to_owned());