From 4acd6cbe3bf5a7987d428c819c3d5fec5289ac9d Mon Sep 17 00:00:00 2001 From: Tomusdrw Date: Mon, 26 Sep 2016 12:24:52 +0200 Subject: [PATCH] Fixing tests --- rpc/src/v1/impls/ethcore.rs | 2 +- rpc/src/v1/tests/mocked/ethcore.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpc/src/v1/impls/ethcore.rs b/rpc/src/v1/impls/ethcore.rs index 3a97c9b62..220ead3dd 100644 --- a/rpc/src/v1/impls/ethcore.rs +++ b/rpc/src/v1/impls/ethcore.rs @@ -231,6 +231,6 @@ impl Ethcore for EthcoreClient where M: MinerService + try!(self.active()); try!(expect_no_params(params)); - to_value(&take_weak!(self.miner).all_transactions().into_iter().map(Into::into).collect::>()) + Ok(to_value(&take_weak!(self.miner).all_transactions().into_iter().map(Into::into).collect::>())) } } diff --git a/rpc/src/v1/tests/mocked/ethcore.rs b/rpc/src/v1/tests/mocked/ethcore.rs index 5cdd94b63..811ccced4 100644 --- a/rpc/src/v1/tests/mocked/ethcore.rs +++ b/rpc/src/v1/tests/mocked/ethcore.rs @@ -299,5 +299,5 @@ fn rpc_ethcore_pending_transactions() { let request = r#"{"jsonrpc": "2.0", "method": "ethcore_pendingTransactions", "params":[], "id": 1}"#; let response = r#"{"jsonrpc":"2.0","result":[],"id":1}"#; - assert_eq!(io.handle_request(request), Some(response.to_owned())); + assert_eq!(io.handle_request_sync(request), Some(response.to_owned())); }