Merge branch 'rpc-async' of github.com:ethcore/parity into rpc-async

openethereum · Aug 29, 2016 · 9d053d9 · 9d053d9
2 parents 13d1787 + 60f6691
commit 9d053d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rpc/src/v1/helpers/signing_queue.rs b/rpc/src/v1/helpers/signing_queue.rs
@@ -353,10 +353,10 @@ mod test {
 			// Just wait for the other thread to start
 			thread::sleep(Duration::from_millis(100));
 		}
-		queue.request_confirmed(id, to_value(&NH256::from(H256::from(1))));
+		queue.request_confirmed(id, Ok(to_value(&NH256::from(H256::from(1)))));
 
 		// then
-		assert_eq!(handle.join().expect("Thread should finish nicely"), to_value(&NH256::from(H256::from(1))));
+		assert_eq!(handle.join().expect("Thread should finish nicely"), Ok(to_value(&NH256::from(H256::from(1)))));
 	}
 
 	#[test]

diff --git a/rpc/src/v1/tests/mocked/eth_signing.rs b/rpc/src/v1/tests/mocked/eth_signing.rs
@@ -81,7 +81,7 @@ fn should_add_sign_to_queue() {
 	let async_result = tester.io.handle_request(&request).unwrap();
 	assert_eq!(tester.queue.requests().len(), 1);
 	// respond
-	tester.queue.request_confirmed(U256::from(1), to_value(&RpcH520::from(H520::default())));
+	tester.queue.request_confirmed(U256::from(1), Ok(to_value(&RpcH520::from(H520::default()))));
 	assert!(async_result.on_result(move |res| {
 		assert_eq!(res, response.to_owned());
 	}));
@@ -155,7 +155,7 @@ fn should_check_status_of_request_when_its_resolved() {
 		"id": 1
 	}"#;
 	tester.io.handle_request_sync(&request).expect("Sent");
-	tester.queue.request_confirmed(U256::from(1), to_value(&"Hello World!"));
+	tester.queue.request_confirmed(U256::from(1), Ok(to_value(&"Hello World!")));
 
 	// when
 	let request = r#"{
@@ -221,7 +221,7 @@ fn should_add_transaction_to_queue() {
 	let async_result = tester.io.handle_request(&request).unwrap();
 	assert_eq!(tester.queue.requests().len(), 1);
 	// respond
-	tester.queue.request_confirmed(U256::from(1), to_value(&RpcH256::from(H256::default())));
+	tester.queue.request_confirmed(U256::from(1), Ok(to_value(&RpcH256::from(H256::default()))));
 	assert!(async_result.on_result(move |res| {
 		assert_eq!(res, response.to_owned());
 	}));