Skip to content

Commit c256dda

Browse files
committed
fix: format errors
1 parent e3bff41 commit c256dda

File tree

2 files changed

+30
-29
lines changed

2 files changed

+30
-29
lines changed

availability-oracle/src/contract.rs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
use async_trait::async_trait;
22
use common::prelude::*;
33
use common::prometheus;
4-
use secp256k1::key::SecretKey;
5-
use std::sync::Arc;
6-
use std::time::{Duration};
7-
use url::Url;
8-
use ethers:: {
4+
use ethers::{
95
abi::Address,
106
contract::abigen,
117
middleware::SignerMiddleware,
128
providers::{Http, Middleware, Provider},
139
signers::{LocalWallet, Signer},
1410
};
11+
use secp256k1::key::SecretKey;
12+
use std::sync::Arc;
13+
use std::time::Duration;
14+
use url::Url;
1515

1616
#[async_trait]
1717
pub trait RewardsManager {
@@ -28,10 +28,10 @@ pub struct RewardsManagerContract {
2828

2929
impl RewardsManagerContract {
3030
pub async fn new(
31-
signing_key: &SecretKey,
32-
url: Url,
33-
rewards_manager_contract: String,
34-
logger: Logger
31+
signing_key: &SecretKey,
32+
url: Url,
33+
rewards_manager_contract: String,
34+
logger: Logger,
3535
) -> Self {
3636
let http_client = reqwest::ClientBuilder::new()
3737
.tcp_nodelay(true)
@@ -40,11 +40,12 @@ impl RewardsManagerContract {
4040
.unwrap();
4141
let provider = Provider::new(Http::new_with_client(url, http_client));
4242
let chain_id = provider.get_chainid().await.unwrap().as_u64();
43-
let wallet =
44-
LocalWallet::from_bytes(signing_key.as_ref()).unwrap().with_chain_id(chain_id);
43+
let wallet = LocalWallet::from_bytes(signing_key.as_ref())
44+
.unwrap()
45+
.with_chain_id(chain_id);
4546
let provider = Arc::new(SignerMiddleware::new(provider, wallet));
4647
let address: Address = rewards_manager_contract.parse().unwrap();
47-
let contract = RewardsManagerABI::new(address, provider.clone(),);
48+
let contract = RewardsManagerABI::new(address, provider.clone());
4849
Self { contract, logger }
4950
}
5051
}
@@ -64,14 +65,15 @@ impl RewardsManager for RewardsManagerContract {
6465
let ids: Vec<[u8; 32usize]> = chunk.iter().map(|s| s.0).collect();
6566
let statuses: Vec<bool> = chunk.iter().map(|s| s.1).collect();
6667
let num_subgraphs = ids.len() as u64;
67-
let tx = self.contract
68+
let tx = self
69+
.contract
6870
.set_denied_many(ids, statuses)
6971
// To avoid gas estimation errors, we use a high enough gas limit for 100 items
7072
.gas(ethers::core::types::U256::from(3_000_000u64));
71-
73+
7274
if let Err(err) = tx.call().await {
73-
let message = err.decode_revert::<String>().unwrap();
74-
error!(self.logger, "Transaction failed";
75+
let message = err.decode_revert::<String>().unwrap();
76+
error!(self.logger, "Transaction failed";
7577
"message" => message,
7678
);
7779
} else {

availability-oracle/src/main.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use std::{fmt::Display, str::FromStr};
1818
use structopt::StructOpt;
1919
use tiny_cid::Cid;
2020
use tokio::time::MissedTickBehavior;
21-
use util::bytes32_to_cid_v0;
2221
use url::Url;
22+
use util::bytes32_to_cid_v0;
2323

2424
fn parse_secs(secs: &str) -> Result<Duration, Error> {
2525
Ok(Duration::from_secs(u64::from_str(secs)?))
@@ -127,12 +127,8 @@ struct Config {
127127
help = "The address of the rewards manager contract"
128128
)]
129129
pub rewards_manager_contract: String,
130-
131-
#[structopt(
132-
long,
133-
env = "RPC_URL",
134-
help = "RPC url for the network"
135-
)]
130+
131+
#[structopt(long, env = "RPC_URL", help = "RPC url for the network")]
136132
pub url: Url,
137133
}
138134

@@ -147,12 +143,15 @@ async fn run(logger: Logger, config: Config) -> Result<()> {
147143
let contract: Box<dyn RewardsManager> = match config.dry_run {
148144
false => {
149145
let signing_key: &SecretKey = &config.signing_key.unwrap().parse()?;
150-
Box::new(RewardsManagerContract::new(
151-
signing_key,
152-
config.url,
153-
config.rewards_manager_contract,
154-
logger.clone(),
155-
).await)
146+
Box::new(
147+
RewardsManagerContract::new(
148+
signing_key,
149+
config.url,
150+
config.rewards_manager_contract,
151+
logger.clone(),
152+
)
153+
.await,
154+
)
156155
}
157156
true => Box::new(RewardsManagerDryRun::new(logger.clone())),
158157
};

0 commit comments

Comments
 (0)