cli: attesteer commands use let-else pattern

integritee-network · Mar 14, 2023 · 6875baa · 6875baa
1 parent e6cdacc
commit 6875baa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cli/src/attesteer/commands/send_dcap_quote.rs b/cli/src/attesteer/commands/send_dcap_quote.rs
@@ -45,7 +45,9 @@ impl SendDcapQuoteCmd {
 		let rpc_response_str = direct_api.get(&jsonrpc_call).unwrap();
 
 		// Decode RPC response.
-		let rpc_response: RpcResponse = serde_json::from_str(&rpc_response_str).ok().unwrap();
+		let Ok(rpc_response) = serde_json::from_str::<RpcResponse>(&rpc_response_str) else {
+			panic!("Can't parse RPC response: '{rpc_response_str}'");
+		};
 		let rpc_return_value = match RpcReturnValue::from_hex(&rpc_response.result) {
 			Ok(rpc_return_value) => rpc_return_value,
 			Err(e) => panic!("Failed to decode RpcReturnValue: {:?}", e),

diff --git a/cli/src/attesteer/commands/send_ias_attestation.rs b/cli/src/attesteer/commands/send_ias_attestation.rs
@@ -48,7 +48,9 @@ impl SendIasAttestationReportCmd {
 		let rpc_response_str = direct_api.get(&jsonrpc_call).unwrap();
 
 		// Decode RPC response.
-		let rpc_response: RpcResponse = serde_json::from_str(&rpc_response_str).ok().unwrap();
+		let Ok(rpc_response) = serde_json::from_str::<RpcResponse>(&rpc_response_str) else {
+			panic!("Can't parse RPC response: '{rpc_response_str}'");
+		};
 		let rpc_return_value = match RpcReturnValue::from_hex(&rpc_response.result) {
 			Ok(rpc_return_value) => rpc_return_value,
 			Err(e) => panic!("Failed to decode RpcReturnValue: {:?}", e),