diff --git a/ethcore/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs index 1013612e8..a7c9f9db2 100644 --- a/ethcore/src/ethereum/ethash.rs +++ b/ethcore/src/ethereum/ethash.rs @@ -255,13 +255,13 @@ impl Engine for Arc { fn on_new_block(&self, block: &mut ExecutedBlock, last_hashes: Arc) -> Result<(), Error> { let parent_hash = block.fields().header.parent_hash().clone(); - try!(::engines::common::push_last_hash(block, last_hashes, self, &parent_hash)); + ::engines::common::push_last_hash(block, last_hashes, self, &parent_hash)?; if block.fields().header.number() == self.ethash_params.dao_hardfork_transition { let state = block.fields_mut().state; for child in &self.ethash_params.dao_hardfork_accounts { let beneficiary = &self.ethash_params.dao_hardfork_beneficiary; - try!(state.balance(child) - .and_then(|b| state.transfer_balance(child, beneficiary, &b, CleanupMode::NoEmpty))); + state.balance(child) + .and_then(|b| state.transfer_balance(child, beneficiary, &b, CleanupMode::NoEmpty))?; } } Ok(()) diff --git a/secret_store/src/key_server_cluster/io/deadline.rs b/secret_store/src/key_server_cluster/io/deadline.rs index 7b8c4d0ed..501a69057 100644 --- a/secret_store/src/key_server_cluster/io/deadline.rs +++ b/secret_store/src/key_server_cluster/io/deadline.rs @@ -24,7 +24,7 @@ type DeadlineBox where F: Future = BoxFuture, F::Erro /// Complete a passed future or fail if it is not completed within timeout. pub fn deadline(duration: Duration, handle: &Handle, future: F) -> Result, io::Error> where F: Future + Send + 'static, T: 'static { - let timeout = try!(Timeout::new(duration, handle)).map(|_| DeadlineStatus::Timeout).boxed(); + let timeout = Timeout::new(duration, handle)?.map(|_| DeadlineStatus::Timeout).boxed(); let future = future.map(DeadlineStatus::Meet).boxed(); let deadline = Deadline { future: timeout.select(future), diff --git a/sync/src/api.rs b/sync/src/api.rs index edf83ee17..737456167 100644 --- a/sync/src/api.rs +++ b/sync/src/api.rs @@ -709,7 +709,7 @@ impl LightSync { }; let mut light_proto = LightProtocol::new(params.client.clone(), light_params); - let sync_handler = Arc::new(try!(SyncHandler::new(params.client.clone()))); + let sync_handler = Arc::new(SyncHandler::new(params.client.clone())?); light_proto.add_handler(sync_handler.clone()); for handler in params.handlers { @@ -719,7 +719,7 @@ impl LightSync { (sync_handler, Arc::new(light_proto)) }; - let service = try!(NetworkService::new(params.network_config)); + let service = NetworkService::new(params.network_config)?; Ok(LightSync { proto: light_proto, diff --git a/sync/src/light_sync/mod.rs b/sync/src/light_sync/mod.rs index 2bc179a21..2cfbafa17 100644 --- a/sync/src/light_sync/mod.rs +++ b/sync/src/light_sync/mod.rs @@ -551,7 +551,7 @@ impl LightSync { peers: RwLock::new(HashMap::new()), pending_reqs: Mutex::new(HashSet::new()), client: client, - rng: Mutex::new(try!(OsRng::new())), + rng: Mutex::new(OsRng::new()?), state: Mutex::new(SyncState::Idle), }) } diff --git a/sync/src/light_sync/response.rs b/sync/src/light_sync/response.rs index d85d2548d..73ce58b39 100644 --- a/sync/src/light_sync/response.rs +++ b/sync/src/light_sync/response.rs @@ -47,7 +47,7 @@ impl From for BasicError { impl fmt::Display for BasicError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - try!(write!(f, "Header response verification error: ")); + write!(f, "Header response verification error: ")?; match *self { BasicError::WrongSkip(ref exp, ref got) @@ -78,13 +78,13 @@ pub fn verify(headers: &[encoded::Header], request: &HeadersRequest) -> Result try!(StartsAtNumber(*num).verify(&headers, reverse)), - HashOrNumber::Hash(ref hash) => try!(StartsAtHash(*hash).verify(&headers, reverse)), + HashOrNumber::Number(ref num) => StartsAtNumber(*num).verify(&headers, reverse)?, + HashOrNumber::Hash(ref hash) => StartsAtHash(*hash).verify(&headers, reverse)?, } - try!(SkipsBetween(request.skip).verify(&headers, reverse)); + SkipsBetween(request.skip).verify(&headers, reverse)?; Ok(headers) }