From 4d7b0828330b6967c480c76e924b1f79694c333e Mon Sep 17 00:00:00 2001 From: Ashok Menon Date: Tue, 24 Dec 2024 15:46:07 +0000 Subject: [PATCH] chore(test): get rid of `wait_for_objects_snapshot_catchup` ## Description This used to be part of the interface neded by the transactional test runner to talk to the off chain state of the test cluster, but it is no longer in use (and isn't necessary for `sui-indexer-alt`), so it's easiest to get rid of it. ## Test plan ``` sui$ cargo nextest run \ -p sui-indexer-alt-e2e-tests \ -p sui-graphql-e2e-tests ``` --- crates/sui-graphql-e2e-tests/tests/tests.rs | 6 ------ crates/sui-indexer-alt-e2e-tests/tests/tests.rs | 4 ---- crates/sui-transactional-test-runner/src/offchain_state.rs | 4 ---- crates/sui-transactional-test-runner/src/test_adapter.rs | 2 -- 4 files changed, 16 deletions(-) diff --git a/crates/sui-graphql-e2e-tests/tests/tests.rs b/crates/sui-graphql-e2e-tests/tests/tests.rs index 592825ad20094..e15d76d6ec351 100644 --- a/crates/sui-graphql-e2e-tests/tests/tests.rs +++ b/crates/sui-graphql-e2e-tests/tests/tests.rs @@ -22,12 +22,6 @@ pub struct OffchainReaderForAdapter { #[async_trait] impl OffchainStateReader for OffchainReaderForAdapter { - async fn wait_for_objects_snapshot_catchup(&self, base_timeout: Duration) { - self.cluster - .wait_for_objects_snapshot_catchup(base_timeout) - .await - } - async fn wait_for_checkpoint_catchup(&self, checkpoint: u64, base_timeout: Duration) { self.cluster .wait_for_checkpoint_catchup(checkpoint, base_timeout) diff --git a/crates/sui-indexer-alt-e2e-tests/tests/tests.rs b/crates/sui-indexer-alt-e2e-tests/tests/tests.rs index 371b7f8aaa8be..1fc6d064ad1b5 100644 --- a/crates/sui-indexer-alt-e2e-tests/tests/tests.rs +++ b/crates/sui-indexer-alt-e2e-tests/tests/tests.rs @@ -193,10 +193,6 @@ impl OffchainReader { #[async_trait::async_trait] impl OffchainStateReader for OffchainReader { - async fn wait_for_objects_snapshot_catchup(&self, _: Duration) { - // Not necessary for `sui-indexer-alt` - } - async fn wait_for_checkpoint_catchup(&self, checkpoint: u64, base_timeout: Duration) { let _ = tokio::time::timeout(base_timeout, self.wait_for_checkpoint(checkpoint)).await; } diff --git a/crates/sui-transactional-test-runner/src/offchain_state.rs b/crates/sui-transactional-test-runner/src/offchain_state.rs index fd788234ff6df..e1a473101aa7e 100644 --- a/crates/sui-transactional-test-runner/src/offchain_state.rs +++ b/crates/sui-transactional-test-runner/src/offchain_state.rs @@ -15,10 +15,6 @@ pub struct TestResponse { /// these methods are used in the `RunGraphqlCommand` to stabilize the off-chain indexed state. #[async_trait] pub trait OffchainStateReader: Send + Sync + 'static { - /// Polls the objects snapshot table until it is within the allowed lag from the latest - /// checkpoint. - async fn wait_for_objects_snapshot_catchup(&self, base_timeout: Duration); - /// Polls the checkpoint table until the given checkpoint is committed. async fn wait_for_checkpoint_catchup(&self, checkpoint: u64, base_timeout: Duration); diff --git a/crates/sui-transactional-test-runner/src/test_adapter.rs b/crates/sui-transactional-test-runner/src/test_adapter.rs index 93d466745d757..fab98958a88cc 100644 --- a/crates/sui-transactional-test-runner/src/test_adapter.rs +++ b/crates/sui-transactional-test-runner/src/test_adapter.rs @@ -624,8 +624,6 @@ impl<'a> MoveTestAdapter<'a> for SuiTestAdapter { .wait_for_checkpoint_catchup(highest_checkpoint, Duration::from_secs(60)) .await; - // wait_for_objects_snapshot_catchup(graphql_client, Duration::from_secs(180)).await; - if let Some(checkpoint_to_prune) = wait_for_checkpoint_pruned { offchain_reader .wait_for_pruned_checkpoint(checkpoint_to_prune, Duration::from_secs(60))