From c78936e04e9f83b2358ebb0f0dbe9fb38e7dc5c9 Mon Sep 17 00:00:00 2001 From: stefan-mysten <135084671+stefan-mysten@users.noreply.github.com> Date: Tue, 2 Jul 2024 09:53:22 -0700 Subject: [PATCH] [indexer] Fix indexer to compile for Rust 1.75 (#18490) ## Description These changes ensure that brew can compile our code to release `sui` binary, and similarly, that `cargo install [..] sui --branch testnet` does not break. We need this to go with the testnet release today. ## Test plan How did you test the new or updated feature? --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] Indexer: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: --- crates/sui-indexer/src/handlers/checkpoint_handler.rs | 2 +- crates/sui-indexer/src/test_utils.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/sui-indexer/src/handlers/checkpoint_handler.rs b/crates/sui-indexer/src/handlers/checkpoint_handler.rs index a0fd533cabda25..b3897f2fe89350 100644 --- a/crates/sui-indexer/src/handlers/checkpoint_handler.rs +++ b/crates/sui-indexer/src/handlers/checkpoint_handler.rs @@ -69,7 +69,7 @@ pub async fn new_handlers( ) -> Result, IndexerError> where S: IndexerStore + Clone + Sync + Send + 'static, - T: R2D2Connection, + T: R2D2Connection + 'static, { let checkpoint_queue_size = std::env::var("CHECKPOINT_QUEUE_SIZE") .unwrap_or(CHECKPOINT_QUEUE_SIZE.to_string()) diff --git a/crates/sui-indexer/src/test_utils.rs b/crates/sui-indexer/src/test_utils.rs index 22b243cd7279a1..421039555ca9c1 100644 --- a/crates/sui-indexer/src/test_utils.rs +++ b/crates/sui-indexer/src/test_utils.rs @@ -40,7 +40,7 @@ impl ReaderWriterConfig { } } -pub async fn start_test_indexer( +pub async fn start_test_indexer( db_url: Option, rpc_url: String, reader_writer_config: ReaderWriterConfig, @@ -57,7 +57,7 @@ pub async fn start_test_indexer( .await } -pub async fn start_test_indexer_impl( +pub async fn start_test_indexer_impl( db_url: Option, rpc_url: String, reader_writer_config: ReaderWriterConfig,