From 022ccb5bcef2ef7eab2dafcad52188dcad76f6f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Wed, 30 Nov 2016 16:21:57 +0100
Subject: [PATCH] Fixing tests

---
 ethcore/src/account_provider.rs   | 9 +++++----
 ethstore/src/ethstore.rs          | 3 +++
 rpc/src/v1/types/confirmations.rs | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ethcore/src/account_provider.rs b/ethcore/src/account_provider.rs
index 637a20401..da5992f0c 100644
--- a/ethcore/src/account_provider.rs
+++ b/ethcore/src/account_provider.rs
@@ -81,10 +81,11 @@ impl KeyDirectory for NullDir {
 	}
 
 	fn insert(&self, account: SafeAccount) -> Result<SafeAccount, SSError> {
-		self.accounts.write()
-			.entry(account.address.clone())
-			.or_insert_with(Vec::new)
-			.push(account.clone());
+		let mut lock = self.accounts.write();
+		let mut accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new);
+		// If the filename is the same we just need to replace the entry
+		accounts.retain(|acc| acc.filename != account.filename);
+		accounts.push(account.clone());
 		Ok(account)
 	}
 
diff --git a/ethstore/src/ethstore.rs b/ethstore/src/ethstore.rs
index 158a7c55a..ec3cc16b9 100644
--- a/ethstore/src/ethstore.rs
+++ b/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(())
 	}
diff --git a/rpc/src/v1/types/confirmations.rs b/rpc/src/v1/types/confirmations.rs
index 795d24726..a4284fa5c 100644
--- a/rpc/src/v1/types/confirmations.rs
+++ b/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());