Skip to content

Commit 05ac2b0

Browse files
committed
rustfmt
1 parent 1fca9ec commit 05ac2b0

File tree

3 files changed

+33
-40
lines changed

3 files changed

+33
-40
lines changed

sentry/src/access.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,11 @@ pub async fn check_access(
7676
return Ok(());
7777
}
7878

79-
let apply_all_rules = try_join_all(rules.iter().map(|rule| {
80-
apply_rule(
81-
redis.clone(),
82-
rule,
83-
events,
84-
campaign,
85-
&auth_uid,
86-
session,
87-
)
88-
}));
79+
let apply_all_rules = try_join_all(
80+
rules
81+
.iter()
82+
.map(|rule| apply_rule(redis.clone(), rule, events, campaign, &auth_uid, session)),
83+
);
8984

9085
apply_all_rules.await.map_err(Error::RulesError).map(|_| ())
9186
}

sentry/src/middleware/campaign.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ impl<A: Adapter + 'static> Middleware<A> for CampaignLoad {
3737

3838
#[cfg(test)]
3939
mod test {
40-
use primitives::{
41-
util::tests::prep_db::{DUMMY_CAMPAIGN, IDS},
42-
Campaign,
43-
};
40+
use primitives::{util::tests::prep_db::DUMMY_CAMPAIGN, Campaign};
4441

4542
use crate::{db::insert_campaign, test_util::setup_dummy_app};
4643

sentry/src/routes/campaign.rs

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -70,31 +70,34 @@ pub async fn create_campaign<A: Adapter>(
7070
let error_response =
7171
ResponseError::BadRequest("err occurred; please try again later".to_string());
7272

73-
let total_remaining =
74-
{
75-
let accounting_spent = get_accounting(
76-
app.pool.clone(),
77-
campaign.channel.id(),
78-
campaign.creator,
79-
Side::Spender,
80-
)
81-
.await?
82-
.map(|accounting| accounting.amount)
83-
.unwrap_or_default();
73+
let total_remaining = {
74+
let accounting_spent = get_accounting(
75+
app.pool.clone(),
76+
campaign.channel.id(),
77+
campaign.creator,
78+
Side::Spender,
79+
)
80+
.await?
81+
.map(|accounting| accounting.amount)
82+
.unwrap_or_default();
8483

85-
let latest_spendable =
86-
fetch_spendable(app.pool.clone(), &campaign.creator, &campaign.channel.id())
87-
.await?
88-
.ok_or_else(|| ResponseError::BadRequest(
84+
let latest_spendable =
85+
fetch_spendable(app.pool.clone(), &campaign.creator, &campaign.channel.id())
86+
.await?
87+
.ok_or_else(|| {
88+
ResponseError::BadRequest(
8989
"No spendable amount found for the Campaign creator".to_string(),
90-
))?;
91-
// Gets the latest Spendable for this (spender, channelId) pair
92-
let total_deposited = latest_spendable.deposit.total;
93-
94-
total_deposited.checked_sub(&accounting_spent).ok_or_else(||
95-
ResponseError::FailedValidation("No more budget remaining".to_string()),
96-
)?
97-
};
90+
)
91+
})?;
92+
// Gets the latest Spendable for this (spender, channelId) pair
93+
let total_deposited = latest_spendable.deposit.total;
94+
95+
total_deposited
96+
.checked_sub(&accounting_spent)
97+
.ok_or_else(|| {
98+
ResponseError::FailedValidation("No more budget remaining".to_string())
99+
})?
100+
};
98101

99102
let channel_campaigns = get_campaigns_by_channel(&app.pool, &campaign.channel.id())
100103
.await?
@@ -315,9 +318,7 @@ pub mod update_campaign {
315318
.get_remaining_opt(campaign.id)
316319
.await?
317320
.map(|remaining| UnifiedNum::from(max(0, remaining).unsigned_abs()))
318-
.ok_or_else(|| Error::FailedUpdate(
319-
"No remaining entry for campaign".to_string(),
320-
))?;
321+
.ok_or_else(|| Error::FailedUpdate("No remaining entry for campaign".to_string()))?;
321322

322323
let campaign_spent = campaign
323324
.budget

0 commit comments

Comments
 (0)