From 1e6d889fc7edab9978ff661c96ab6d37b4571ce3 Mon Sep 17 00:00:00 2001
From: Wei Tang <accounts@that.world>
Date: Sat, 31 Mar 2018 17:06:16 +0800
Subject: [PATCH] eth_uninstallFilter should return false for non-existent
 filter (#8280)

* eth_uninstallFilter should return false for non-existent filter

* Use shorter form is_some()
---
 rpc/src/v1/helpers/poll_manager.rs | 4 ++--
 rpc/src/v1/impls/eth_filter.rs     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rpc/src/v1/helpers/poll_manager.rs b/rpc/src/v1/helpers/poll_manager.rs
index ab44dc35f..f367f669f 100644
--- a/rpc/src/v1/helpers/poll_manager.rs
+++ b/rpc/src/v1/helpers/poll_manager.rs
@@ -74,8 +74,8 @@ impl<F, T> PollManager<F, T> where T: Timer {
 	}
 
 	/// Removes poll info.
-	pub fn remove_poll(&mut self, id: &PollId) {
-		self.polls.remove(id);
+	pub fn remove_poll(&mut self, id: &PollId) -> bool {
+		self.polls.remove(id).is_some()
 	}
 }
 
diff --git a/rpc/src/v1/impls/eth_filter.rs b/rpc/src/v1/impls/eth_filter.rs
index 0ff9f4c20..6c3d6837e 100644
--- a/rpc/src/v1/impls/eth_filter.rs
+++ b/rpc/src/v1/impls/eth_filter.rs
@@ -242,7 +242,6 @@ impl<T: Filterable + Send + Sync + 'static> EthFilter for T {
 	}
 
 	fn uninstall_filter(&self, index: Index) -> Result<bool> {
-		self.polls().lock().remove_poll(&index.value());
-		Ok(true)
+		Ok(self.polls().lock().remove_poll(&index.value()))
 	}
 }