Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle critical errors #181

Merged
merged 14 commits into from
Feb 18, 2025
Merged

Handle critical errors #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1aa3c6a
added server restart
idky137 Feb 4, 2025
5812d51
Merge branch 'zaino_serve_2' of github.com:idky137/zaino into critica…
idky137 Feb 6, 2025
e25397c
Merge branch 'zaino_serve_2' of github.com:idky137/zaino into critica…
idky137 Feb 7, 2025
48e14bb
fixed check_for_critical_errors
idky137 Feb 7, 2025
2c8feb9
Merge branch 'zaino_serve_2' of github.com:idky137/zaino into critica…
idky137 Feb 9, 2025
45ab318
Merge branch 'zaino_serve_2' of github.com:idky137/zaino into critica…
idky137 Feb 9, 2025
1304dab
Merge branch 'dev' of github.com:zingolabs/zaino into critical_errors
idky137 Feb 12, 2025
c68bfa6
reconfigured AtomicStatuses
idky137 Feb 13, 2025
2e5b083
review
idky137 Feb 13, 2025
775aea8
added fetchservice wait on mempool
idky137 Feb 13, 2025
e7378d2
fixed tests
idky137 Feb 15, 2025
3abd2bb
updated status to include RecoverableError
idky137 Feb 15, 2025
4c04fc7
Merge branch 'dev' of github.com:zingolabs/zaino into critical_errors
idky137 Feb 15, 2025
745cd85
add StatusType::combine helper fn
AloeareV Feb 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .config/nextest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[profile.default]
test-threads = 4
fail-fast = false
89 changes: 69 additions & 20 deletions integration-tests/tests/wallet_to_validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,11 @@ mod wallet_basic {

if validator == "zebrad" {
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
};

Expand All @@ -77,6 +79,7 @@ mod wallet_basic {
.await
.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.recipient.do_sync(true).await.unwrap();

assert_eq!(
Expand Down Expand Up @@ -115,9 +118,11 @@ mod wallet_basic {

if validator == "zebrad" {
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
};

Expand All @@ -132,6 +137,7 @@ mod wallet_basic {
.await
.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.recipient.do_sync(true).await.unwrap();

assert_eq!(
Expand Down Expand Up @@ -171,9 +177,11 @@ mod wallet_basic {

if validator == "zebrad" {
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
};

Expand All @@ -189,6 +197,7 @@ mod wallet_basic {
.unwrap();

test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;

let fetch_service = zaino_fetch::jsonrpc::connector::JsonRpcConnector::new_with_basic_auth(
test_node_and_return_url(
Expand Down Expand Up @@ -222,7 +231,17 @@ mod wallet_basic {

dbg!(unfinalised_transactions.clone());

test_manager.local_net.generate_blocks(99).await.unwrap();
// Generate blocks
//
// NOTE: Generating blocks with zcashd blocks the tokio main thread???, stopping background processes from running,
// for this reason we generate blocks 1 at a time and sleep to let other tasks run.
for height in 1..=99 {
dbg!("Generating block at height: {}", height);
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
}

tokio::time::sleep(std::time::Duration::from_millis(500)).await;

println!("\n\nFetching Tx From Finalized Chain!\n");

Expand Down Expand Up @@ -275,20 +294,25 @@ mod wallet_basic {
.expect("Clients are not initialized");

test_manager.local_net.generate_blocks(2).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();

// "Create" 3 orchard notes in faucet.
if validator == "zebrad" {
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
};

Expand Down Expand Up @@ -323,7 +347,17 @@ mod wallet_basic {
.await
.unwrap();

test_manager.local_net.generate_blocks(100).await.unwrap();
// Generate blocks
//
// NOTE: Generating blocks with zcashd blocks the tokio main thread???, stopping background processes from running,
// for this reason we generate blocks 1 at a time and sleep to let other tasks run.
for height in 1..=100 {
dbg!("Generating block at height: {}", height);
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
}

tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.recipient.do_sync(true).await.unwrap();

assert_eq!(
Expand Down Expand Up @@ -380,9 +414,11 @@ mod wallet_basic {

if validator == "zebrad" {
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
};

Expand All @@ -397,7 +433,17 @@ mod wallet_basic {
.await
.unwrap();

test_manager.local_net.generate_blocks(100).await.unwrap();
// Generate blocks
//
// NOTE: Generating blocks with zcashd blocks the tokio main thread???, stopping background processes from running,
// for this reason we generate blocks 1 at a time and sleep to let other tasks run.
for height in 1..=100 {
dbg!("Generating block at height: {}", height);
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(100)).await;
}

tokio::time::sleep(std::time::Duration::from_secs(1)).await;
clients.recipient.do_sync(true).await.unwrap();

assert_eq!(
Expand All @@ -412,6 +458,7 @@ mod wallet_basic {

clients.recipient.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.recipient.do_sync(true).await.unwrap();

assert_eq!(
Expand Down Expand Up @@ -449,16 +496,20 @@ mod wallet_basic {
let recipient_client = Arc::new(clients.recipient);

test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();

if validator == "zebrad" {
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(100).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
clients.faucet.quick_shield().await.unwrap();
test_manager.local_net.generate_blocks(1).await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
clients.faucet.do_sync(true).await.unwrap();
};

Expand Down Expand Up @@ -528,22 +579,6 @@ mod wallet_basic {
.await
);

test_manager.local_net.generate_blocks(1).await.unwrap();

println!("\n\nFetching Mined Tx 1!\n");
let _transaction_1 = dbg!(
fetch_service
.get_raw_transaction(mempool_txids.transactions[0].clone(), Some(1))
.await
);

println!("\n\nFetching Mined Tx 2!\n");
let _transaction_2 = dbg!(
fetch_service
.get_raw_transaction(mempool_txids.transactions[1].clone(), Some(1))
.await
);

assert_eq!(
recipient_client
.do_balance()
Expand All @@ -562,7 +597,21 @@ mod wallet_basic {
);

test_manager.local_net.generate_blocks(1).await.unwrap();
recipient_client.do_rescan().await.unwrap();
tokio::time::sleep(std::time::Duration::from_millis(500)).await;

println!("\n\nFetching Mined Tx 1!\n");
let _transaction_1 = dbg!(
fetch_service
.get_raw_transaction(mempool_txids.transactions[0].clone(), Some(1))
.await
);

println!("\n\nFetching Mined Tx 2!\n");
let _transaction_2 = dbg!(
fetch_service
.get_raw_transaction(mempool_txids.transactions[1].clone(), Some(1))
.await
);

assert_eq!(
recipient_client
Expand Down
5 changes: 2 additions & 3 deletions zaino-serve/src/server/grpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,8 @@ impl TonicServer {
pub async fn spawn(
service_subscriber: IndexerSubscriber<FetchServiceSubscriber>,
server_config: GrpcConfig,
status: AtomicStatus,
) -> Result<Self, ServerError> {
status.store(StatusType::Spawning as usize);
let status = AtomicStatus::new(StatusType::Spawning.into());

let svc = CompactTxStreamerServer::new(GrpcClient {
service_subscriber: service_subscriber.clone(),
Expand Down Expand Up @@ -78,7 +77,7 @@ impl TonicServer {
}

/// Sets the servers to close gracefully.
pub async fn shutdown(&mut self) {
pub async fn close(&mut self) {
self.status.store(StatusType::Closing as usize);

if let Some(handle) = self.server_handle.take() {
Expand Down
Loading
Loading