zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updates ignored failure messages in lightwalletd_integration test (#8784)

This commit is contained in:
Arya 2024-08-20 18:13:29 -04:00 committed by GitHub
parent 0ecc5eb900
commit 9fbcb4ccd2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zebra-rpc/src/methods/get_block_template_rpcs/get_block_template.rs
View File

@ -25,9 +25,12 @@ use zebra_consensus::{
use zebra_node_services::mempool;
use zebra_state::GetBlockTemplateChainInfo;
use crate::methods::get_block_template_rpcs::{
constants::{MAX_ESTIMATED_DISTANCE_TO_NETWORK_CHAIN_TIP, NOT_SYNCED_ERROR_CODE},
types::{default_roots::DefaultRoots, transaction::TransactionTemplate},
use crate::methods::{
errors::OkOrServerError,
get_block_template_rpcs::{
constants::{MAX_ESTIMATED_DISTANCE_TO_NETWORK_CHAIN_TIP, NOT_SYNCED_ERROR_CODE},
types::{default_roots::DefaultRoots, transaction::TransactionTemplate},
},
};
pub use crate::methods::get_block_template_rpcs::types::get_block_template::*;
@ -178,11 +181,7 @@ where
// but this is ok for an estimate
let (estimated_distance_to_chain_tip, local_tip_height) = latest_chain_tip
.estimate_distance_to_network_chain_tip(network)
.ok_or_else(|| Error {
code: ErrorCode::ServerError(0),
message: "No Chain tip available yet".to_string(),
data: None,
})?;
.ok_or_server_error("no chain tip available yet")?;
if !sync_status.is_close_to_tip()
|| estimated_distance_to_chain_tip > MAX_ESTIMATED_DISTANCE_TO_NETWORK_CHAIN_TIP

2
zebrad/tests/common/failure_messages.rs
View File

@ -121,7 +121,7 @@ pub const LIGHTWALLETD_EMPTY_ZEBRA_STATE_IGNORE_MESSAGES: &[&str] = &[
//
// This log matches the "error with" RPC error message,
// but we expect Zebra to start with an empty state.
r#"No Chain tip available yet","level":"warning","msg":"error with getblockchaininfo rpc, retrying"#,
r#"no chain tip available yet","level":"warning","msg":"error with getblockchaininfo rpc, retrying"#,
];
/// Failure log messages from `zebra-checkpoints`.

2
zebrad/tests/common/test_type.rs
View File

@ -330,7 +330,7 @@ impl TestType {
// Zebra state failures
if self.needs_zebra_cached_state() {
// Fail if we need a cached Zebra state, but it's empty
lightwalletd_failure_messages.push("No Chain tip available yet".to_string());
lightwalletd_failure_messages.push("no chain tip available yet".to_string());
}
// lightwalletd state failures