From af9b02ad06df27214fa2a1cd60fba37c580ce010 Mon Sep 17 00:00:00 2001 From: ksrichard Date: Fri, 8 Nov 2024 14:39:26 +0100 Subject: [PATCH] updated trace logging --- .../src/grpc/base_node_grpc_server.rs | 118 +++++++++--------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/applications/minotari_node/src/grpc/base_node_grpc_server.rs b/applications/minotari_node/src/grpc/base_node_grpc_server.rs index b010eadc47..47c77f34c2 100644 --- a/applications/minotari_node/src/grpc/base_node_grpc_server.rs +++ b/applications/minotari_node/src/grpc/base_node_grpc_server.rs @@ -286,7 +286,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { ))) .await; return; - }, + } }; if headers.is_empty() { @@ -323,7 +323,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Status::internal(format!("Error fetching block at height {}", current_height)), ))); return; - }, + } }; if block.is_none() { let _network_difficulty_response = tx.send(Err(obscure_error_if_true( @@ -379,7 +379,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Err(err) => { warn!(target: LOG_TARGET, "Error communicating with base node: {}", err,); return; - }, + } Ok(data) => data, }; for transaction in transactions.unconfirmed_pool { @@ -401,7 +401,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { ); } return; - }, + } }; if tx @@ -446,7 +446,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { report_error_flag, Status::internal(err.to_string()), )); - }, + } Ok(data) => data.best_block_height(), }; @@ -469,7 +469,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { (res, false) => res + 1, }; (from..=tip, true) - }, + } Sorting::Asc => (0..=num_headers.saturating_sub(1), false), } } else { @@ -480,11 +480,11 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { (res, false) => res + 1, }; (from..=from_height, true) - }, + } Sorting::Asc => { let to = from_height.saturating_add(num_headers).saturating_sub(1); (from_height..=to, false) - }, + } } }; let consensus_rules = self.consensus_rules.clone(); @@ -493,7 +493,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { header_range.end().saturating_add(1), LIST_HEADERS_PAGE_SIZE, ) - .map_err(|e| obscure_error_if_true(report_error_flag, Status::invalid_argument(e)))?; + .map_err(|e| obscure_error_if_true(report_error_flag, Status::invalid_argument(e)))?; task::spawn(async move { trace!( target: LOG_TARGET, @@ -512,7 +512,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Err(err) => { warn!(target: LOG_TARGET, "Internal base node service error: {}", err); return; - }, + } Ok(data) => { if is_reversed { data.into_iter() @@ -531,7 +531,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Err(e) => { Err(obscure_error_if_true(report_error_flag, Status::internal(e)) .to_string()) - }, + } } }) .rev() @@ -553,18 +553,18 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Err(e) => { Err(obscure_error_if_true(report_error_flag, Status::internal(e)) .to_string()) - }, + } } }) .collect::, String>>() } - }, + } }; match result_data { Err(e) => { error!(target: LOG_TARGET, "No result headers transmitted due to error: {}", e) - }, + } Ok(result_data) => { let result_size = result_data.len(); trace!(target: LOG_TARGET, "Result headers: {}", result_size); @@ -585,7 +585,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { return; } } - }, + } } } }); @@ -681,7 +681,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { report_error_flag, Status::invalid_argument(message), )); - }, + } Err(CommsInterfaceError::ChainStorageError(ChainStorageError::CannotCalculateNonTipMmr(msg))) => { let status = Status::with_details( tonic::Code::FailedPrecondition, @@ -689,13 +689,13 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Bytes::from_static(b"CannotCalculateNonTipMmr"), ); return Err(obscure_error_if_true(report_error_flag, status)); - }, + } Err(e) => { return Err(obscure_error_if_true( report_error_flag, Status::internal(e.to_string()), )) - }, + } }; let fees = new_block.body.get_total_fee().map_err(|_| { obscure_error_if_true( @@ -850,12 +850,12 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { })? - prev_coinbase_value, ) - .map_err(|_| { - obscure_error_if_true( - report_error_flag, - Status::internal("Single coinbase fees exceeded u64".to_string()), - ) - })?; + .map_err(|_| { + obscure_error_if_true( + report_error_flag, + Status::internal("Single coinbase fees exceeded u64".to_string()), + ) + })?; prev_coinbase_value += u128::from(coinbase.value); } @@ -896,8 +896,8 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { range_proof_type, PaymentId::Empty, ) - .await - .map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e.to_string())))?; + .await + .map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e.to_string())))?; new_template.body.add_output(coinbase_output); let new_nonce = key_manager .get_next_key(TransactionKeyManagerBranch::KernelNonce.get_branch_key()) @@ -951,7 +951,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { report_error_flag, Status::invalid_argument(message), )); - }, + } Err(CommsInterfaceError::ChainStorageError(ChainStorageError::CannotCalculateNonTipMmr(msg))) => { let status = Status::with_details( tonic::Code::FailedPrecondition, @@ -959,13 +959,13 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Bytes::from_static(b"CannotCalculateNonTipMmr"), ); return Err(obscure_error_if_true(report_error_flag, status)); - }, + } Err(e) => { return Err(obscure_error_if_true( report_error_flag, Status::internal(e.to_string()), )) - }, + } }; let gen_hash = handler .get_header(0) @@ -1094,8 +1094,8 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { range_proof_type, PaymentId::Empty, ) - .await - .map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e.to_string())))?; + .await + .map_err(|e| obscure_error_if_true(report_error_flag, Status::internal(e.to_string())))?; block_template.body.add_output(coinbase_output); let new_nonce = key_manager .get_next_key(TransactionKeyManagerBranch::KernelNonce.get_branch_key()) @@ -1149,7 +1149,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { report_error_flag, Status::invalid_argument(message), )); - }, + } Err(CommsInterfaceError::ChainStorageError(ChainStorageError::CannotCalculateNonTipMmr(msg))) => { let status = Status::with_details( tonic::Code::FailedPrecondition, @@ -1157,13 +1157,13 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Bytes::from_static(b"CannotCalculateNonTipMmr"), ); return Err(obscure_error_if_true(report_error_flag, status)); - }, + } Err(e) => { return Err(obscure_error_if_true( report_error_flag, Status::internal(e.to_string()), )) - }, + } }; let fees = new_block.body.get_total_fee().map_err(|_| { obscure_error_if_true( @@ -1254,7 +1254,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { report_error_flag, Status::invalid_argument(message), )); - }, + } Err(CommsInterfaceError::ChainStorageError(ChainStorageError::CannotCalculateNonTipMmr(msg))) => { let status = Status::with_details( tonic::Code::FailedPrecondition, @@ -1262,13 +1262,13 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Bytes::from_static(b"CannotCalculateNonTipMmr"), ); return Err(obscure_error_if_true(report_error_flag, status)); - }, + } Err(e) => { return Err(obscure_error_if_true( report_error_flag, Status::internal(e.to_string()), )) - }, + } }; // construct response let block_hash = new_block.hash().to_vec(); @@ -1509,7 +1509,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { * should not think its mined, but the * node does not think it is. */ } - }, + } TxStorageResponse::NotStored | TxStorageResponse::NotStoredConsensus | TxStorageResponse::NotStoredOrphan | @@ -1599,7 +1599,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { "Error communicating with local base node: {:?}", err, ); return; - }, + } Ok(data) => data.into_iter().filter(|b| heights.contains(&b.header().height)), }; @@ -1689,7 +1689,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { "Error communicating with local base node: {:?}", err, ); return; - }, + } Ok(data) => data, }; for block in blocks { @@ -1745,7 +1745,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { "Error communicating with local base node: {:?}", err, ); return; - }, + } Ok(data) => data, }; for block in blocks { @@ -1805,7 +1805,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Status::internal(format!("Error communicating with local base node: {}", err)), ))); return; - }, + } Ok(data) => data, }; for output in outputs { @@ -1819,14 +1819,14 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { ); return; } - }, + } Err(err) => { let _ignore = tx.send(Err(obscure_error_if_true( report_error_flag, Status::internal(format!("Error communicating with local base node: {}", err)), ))); return; - }, + } } } }); @@ -1926,7 +1926,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { BlockGroupType::BlockSize, report_error_flag, ) - .await + .await } async fn get_block_fees( @@ -1941,7 +1941,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { BlockGroupType::BlockFees, report_error_flag, ) - .await + .await } async fn get_version(&self, _request: Request) -> Result, Status> { @@ -2308,7 +2308,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Err(err) => { warn!(target: LOG_TARGET, "Base node service error: {}", err,); return; - }, + } Ok(data) => data, }; @@ -2374,7 +2374,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { header.map(|h| h.height()).ok_or_else(|| { obscure_error_if_true(report_error_flag, Status::not_found("Start hash not found")) })? - }, + } None => 0, }; @@ -2394,7 +2394,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Err(err) => { warn!(target: LOG_TARGET, "Base node service error: {}", err); return; - }, + } Ok(data) => data, }; @@ -2484,7 +2484,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Err(e) => { warn!(target: LOG_TARGET, "Base node service error: {}", e); return; - }, + } }; let next_header = match node_service.get_header(height.saturating_add(1)).await { @@ -2495,7 +2495,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { Status::internal(e.to_string()), ))); return; - }, + } }; let sidechain_outputs = utxos @@ -2522,7 +2522,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { ); return; } - }, + } Err(e) => { warn!( target: LOG_TARGET, @@ -2535,13 +2535,13 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { ))) .await; return; - }, + } }; match next_header { Some(header) => { current_header = header; - }, + } None => break, } } @@ -2559,7 +2559,7 @@ impl tari_rpc::base_node_server::BaseNode for BaseNodeGrpcServer { ) -> Result, Status> { self.check_method_enabled(GrpcMethod::GetValidatorNodeChanges)?; let request = request.into_inner(); - trace!(target: LOG_TARGET, "Incoming GRPC request for GetActiveValidatorNodes"); + trace!(target: LOG_TARGET, "Incoming GRPC request for GetValidatorNodeChanges"); let mut handler = self.node_service.clone(); @@ -2621,7 +2621,7 @@ async fn get_block_group( "Error communicating with local base node: {:?}", err, ); vec![] - }, + } Ok(data) => data, }; let extractor = match block_group_type { @@ -2637,15 +2637,15 @@ async fn get_block_group( report_error_flag, Status::unimplemented("Quantile has not been implemented"), )) - }, + } CalcType::Quartile => { return Err(obscure_error_if_true( report_error_flag, Status::unimplemented("Quartile has not been implemented"), )) - }, + } } - .unwrap_or_default(); + .unwrap_or_default(); trace!( target: LOG_TARGET, "Sending GetBlockSize response to client: {:?}", value