Remove provider function.

Author: twittner

timeboost-types/src/lib.rs

@@ -28,7 +28,6 @@ pub use decryption::{
 pub use delayed_inbox::DelayedInboxIndex;
 pub use inclusion_list::InclusionList;
 pub use provider::{HttpProvider, HttpProviderWithWallet, TestProviderWithWallet};
-pub use provider::{provider, provider_with_wallet};
 pub use retry_list::RetryList;
 pub use seqno::SeqNo;
 pub use time::{ConsensusTime, Epoch, HasTime, Timestamp};

timeboost-types/src/provider.rs

@@ -1,13 +1,12 @@
 use alloy::{
     network::{Ethereum, EthereumWallet},
     providers::{
-        ProviderBuilder, RootProvider,
+        RootProvider,
         fillers::{FillProvider, JoinFill, WalletFiller},
         layers::AnvilProvider,
         utils::JoinedRecommendedFillers,
     },
 };
-use url::Url;
 
 /// Type alias that connects to providers with recommended fillers and wallet
 /// use `<HttpProviderWithWallet as WalletProvider>::wallet()` to access internal wallet
@@ -28,13 +27,3 @@ pub type TestProviderWithWallet = FillProvider<
     AnvilProvider<RootProvider>,
     Ethereum,
 >;
-
-pub fn provider(rpc: &Url) -> HttpProvider {
-    ProviderBuilder::new().connect_http(rpc.clone())
-}
-
-pub fn provider_with_wallet(rpc: &Url, wallet: EthereumWallet) -> HttpProviderWithWallet {
-    ProviderBuilder::new()
-        .wallet(wallet)
-        .connect_http(rpc.clone())
-}

timeboost/src/binaries/sailfish.rs

@@ -1,7 +1,7 @@
 use std::{iter::repeat_with, path::PathBuf, sync::Arc, time::Duration};
 
 use ::metrics::prometheus::PrometheusMetrics;
-use alloy::providers::Provider;
+use alloy::providers::{Provider, ProviderBuilder};
 use anyhow::{Context, Result};
 use cliquenet::{Network, NetworkMetrics, Overlay};
 use committable::{Commitment, Committable, RawCommitmentBuilder};
@@ -15,7 +15,6 @@ use sailfish::{
 use serde::{Deserialize, Serialize};
 use timeboost::config::NodeConfig;
 use timeboost_contract::{CommitteeMemberSol, KeyManager};
-use timeboost_types::provider;
 use timeboost_utils::types::logging;
 use tokio::{select, signal, time::sleep};
 use tracing::{error, info};
@@ -92,7 +91,7 @@ async fn main() -> Result<()> {
     let dh_keypair = x25519::Keypair::from(config.keys.dh.secret.clone());
 
     // syncing with contract to get peers keys and network addresses
-    let provider = provider(&config.chain.parent.rpc_url);
+    let provider = ProviderBuilder::new().connect_http(config.chain.parent.rpc_url);
     assert_eq!(
         provider.get_chain_id().await?,
         config.chain.parent.id,

timeboost/src/binaries/timeboost.rs

@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use alloy::providers::Provider;
+use alloy::providers::{Provider, ProviderBuilder};
 use anyhow::{Context, Result, bail};
 use cliquenet::AddressableCommittee;
 use multisig::CommitteeId;
@@ -9,7 +9,7 @@ use timeboost::{Timeboost, TimeboostConfig};
 use timeboost_builder::robusta;
 use timeboost_contract::{CommitteeMemberSol, KeyManager};
 use timeboost_crypto::prelude::DkgEncKey;
-use timeboost_types::{DecryptionKeyCell, KeyStore, provider};
+use timeboost_types::{DecryptionKeyCell, KeyStore};
 use tokio::select;
 use tokio::signal;
 use tokio::task::spawn;
@@ -108,7 +108,7 @@ async fn main() -> Result<()> {
     let dh_keypair = x25519::Keypair::from(node_config.keys.dh.secret.clone());
 
     // syncing with contract to get peers keys and network addresses
-    let provider = provider(&node_config.chain.parent.rpc_url);
+    let provider = ProviderBuilder::new().connect_http(node_config.chain.parent.rpc_url.clone());
     assert_eq!(
         provider.get_chain_id().await?,
         node_config.chain.parent.id,