From 245da0349b9238a59c1f0ce7ef022ea13dac35df Mon Sep 17 00:00:00 2001 From: mertwole Date: Tue, 27 Aug 2024 05:11:58 +0000 Subject: [PATCH] Resolve --- Cargo.lock | 22 +++++++++---------- relayer/src/message_relayer/event_listener.rs | 3 +-- .../message_relayer/merkle_root_listener.rs | 3 +-- relayer/src/relay_merkle_roots.rs | 7 ++---- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e17e945c..8bc380ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4826,7 +4826,7 @@ dependencies = [ [[package]] name = "gear-lazy-pages-native-interface" version = "1.5.0" -source = "git+https://github.com/gear-tech/gear.git?tag=v1.5.0#e8e01a8c8a08954b3f80083512201abc058ee730" +source = "git+https://github.com/gear-tech/gear.git?tag=v1.5.0#33ff492338671fbd6bf63ee7c15e0ccfcf40fbcb" dependencies = [ "gear-core 1.5.0 (git+https://github.com/gear-tech/gear.git?tag=v1.5.0)", "gear-lazy-pages 1.5.0 (git+https://github.com/gear-tech/gear.git?tag=v1.5.0)", @@ -5623,7 +5623,7 @@ dependencies = [ [[package]] name = "gtest" version = "1.5.0" -source = "git+https://github.com/gear-tech/gear.git?tag=v1.5.0#e8e01a8c8a08954b3f80083512201abc058ee730" +source = "git+https://github.com/gear-tech/gear.git?tag=v1.5.0#33ff492338671fbd6bf63ee7c15e0ccfcf40fbcb" dependencies = [ "cargo_toml", "colored", @@ -11944,7 +11944,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.10.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -11994,7 +11994,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "proc-macro2", "quote", @@ -12027,7 +12027,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "environmental", "parity-scale-codec", @@ -12301,7 +12301,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -12345,7 +12345,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "Inflector", "expander", @@ -12486,7 +12486,7 @@ checksum = "2d5bbc9339227d1b6a9b7ccd9b2920c818653d40eef1512f1e2e824d72e7a336" [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" [[package]] name = "sp-storage" @@ -12518,7 +12518,7 @@ dependencies = [ [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "impl-serde", "parity-scale-codec", @@ -12581,7 +12581,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "parity-scale-codec", "tracing", @@ -12727,7 +12727,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#b2ec017c0e5e49f3cbf782a5255bb0f9e88bd6c1" +source = "git+https://github.com/paritytech/polkadot-sdk#a4b51593dbe9b9390fa64f5040a9230b5d33b898" dependencies = [ "impl-trait-for-tuples", "log", diff --git a/relayer/src/message_relayer/event_listener.rs b/relayer/src/message_relayer/event_listener.rs index 2f254fc6..00bd3f27 100644 --- a/relayer/src/message_relayer/event_listener.rs +++ b/relayer/src/message_relayer/event_listener.rs @@ -1,6 +1,5 @@ use std::{ sync::mpsc::{channel, Receiver, Sender}, - thread, time::Duration, }; @@ -105,7 +104,7 @@ impl EventListener { current_block = finalized_head + 1; } else { - thread::sleep(GEAR_BLOCK_TIME_APPROX); + tokio::time::sleep(GEAR_BLOCK_TIME_APPROX).await; } } } diff --git a/relayer/src/message_relayer/merkle_root_listener.rs b/relayer/src/message_relayer/merkle_root_listener.rs index 691d223b..005ab2df 100644 --- a/relayer/src/message_relayer/merkle_root_listener.rs +++ b/relayer/src/message_relayer/merkle_root_listener.rs @@ -1,6 +1,5 @@ use std::{ sync::mpsc::{channel, Receiver, Sender}, - thread, time::Duration, }; @@ -128,7 +127,7 @@ impl MerkleRootListener { current_block = latest + 1; self.metrics.latest_processed_block.inc(); } else { - thread::sleep(ETHEREUM_BLOCK_TIME_APPROX / 2) + tokio::time::sleep(ETHEREUM_BLOCK_TIME_APPROX / 2).await; } } } diff --git a/relayer/src/relay_merkle_roots.rs b/relayer/src/relay_merkle_roots.rs index 21875022..0dd92bd4 100644 --- a/relayer/src/relay_merkle_roots.rs +++ b/relayer/src/relay_merkle_roots.rs @@ -1,9 +1,6 @@ use prometheus::{Gauge, IntGauge}; use prover::proving::GenesisConfig; -use std::{ - thread, - time::{Duration, Instant}, -}; +use std::time::{Duration, Instant}; use crate::{ proof_storage::ProofStorage, @@ -108,7 +105,7 @@ impl MerkleRootRelayer { let main_loop_duration = now.elapsed(); if main_loop_duration < MIN_MAIN_LOOP_DURATION { - thread::sleep(MIN_MAIN_LOOP_DURATION - main_loop_duration); + tokio::time::sleep(MIN_MAIN_LOOP_DURATION - main_loop_duration).await; } } }