Skip to content

Commit 8c3e881

Browse files
committed
cargo fmt
1 parent 8a48a9d commit 8c3e881

File tree

1 file changed

+82
-24
lines changed

1 file changed

+82
-24
lines changed

sentry/src/routes/channel.rs

Lines changed: 82 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,8 @@ mod test {
733733
use super::*;
734734
use crate::{
735735
db::{
736-
insert_campaign, insert_channel, validator_message::{insert_validator_message, get_validator_messages},
736+
insert_campaign, insert_channel,
737+
validator_message::{get_validator_messages, insert_validator_message},
737738
CampaignRemaining,
738739
},
739740
routes::channel::validator_message::create_validator_messages,
@@ -744,20 +745,20 @@ mod test {
744745
prelude::Unlocked,
745746
primitives::Deposit as AdapterDeposit,
746747
};
748+
use chrono::Utc;
747749
use primitives::{
748750
balances::UncheckedState,
749751
channel::Nonce,
750752
config::GANACHE_CONFIG,
753+
sentry::validator_messages::ValidatorMessagesCreateRequest,
751754
test_util::{
752755
ADVERTISER, CREATOR, DUMMY_CAMPAIGN, FOLLOWER, GUARDIAN, IDS, LEADER, LEADER_2,
753-
PUBLISHER, PUBLISHER_2
756+
PUBLISHER, PUBLISHER_2,
754757
},
755-
sentry::validator_messages::ValidatorMessagesCreateRequest,
756-
validator::{ApproveState, MessageTypes, NewState, MessageType, Heartbeat, RejectState},
758+
validator::{ApproveState, Heartbeat, MessageType, MessageTypes, NewState, RejectState},
757759
BigNum, ChainId, Deposit, UnifiedMap, ValidatorId,
758760
};
759761
use std::str::FromStr;
760-
use chrono::Utc;
761762

762763
#[tokio::test]
763764
async fn create_and_fetch_spendable() {
@@ -1580,7 +1581,12 @@ mod test {
15801581
let app_guard = setup_dummy_app().await;
15811582
let app = Extension(Arc::new(app_guard.app.clone()));
15821583
let config = GANACHE_CONFIG.clone();
1583-
let all_message_types: [MessageType; 4] = [MessageType::NewState, MessageType::ApproveState, MessageType::RejectState, MessageType::Heartbeat];
1584+
let all_message_types: [MessageType; 4] = [
1585+
MessageType::NewState,
1586+
MessageType::ApproveState,
1587+
MessageType::RejectState,
1588+
MessageType::Heartbeat,
1589+
];
15841590

15851591
let channel_context = Extension(
15861592
app.config
@@ -1604,11 +1610,15 @@ mod test {
16041610
chain: chain_context.chain.clone(),
16051611
};
16061612

1607-
let req = ValidatorMessagesCreateRequest {
1608-
messages: vec![],
1609-
};
1613+
let req = ValidatorMessagesCreateRequest { messages: vec![] };
16101614

1611-
let res = create_validator_messages(app.clone(), Extension(auth), channel_context.clone(), Json(req)).await;
1615+
let res = create_validator_messages(
1616+
app.clone(),
1617+
Extension(auth),
1618+
channel_context.clone(),
1619+
Json(req),
1620+
)
1621+
.await;
16121622

16131623
assert!(matches!(res, Err(ResponseError::Unauthorized)));
16141624
}
@@ -1621,13 +1631,26 @@ mod test {
16211631
chain: chain_context.chain.clone(),
16221632
};
16231633

1624-
let req = ValidatorMessagesCreateRequest {
1625-
messages: vec![],
1626-
};
1627-
1628-
create_validator_messages(app.clone(), Extension(auth), channel_context.clone(), Json(req)).await.expect("should work");
1634+
let req = ValidatorMessagesCreateRequest { messages: vec![] };
16291635

1630-
let messages = get_validator_messages(&app.pool, &channel_context.context.id(), &Some(IDS[&LEADER]), &all_message_types, 100).await.expect("should get messages");
1636+
create_validator_messages(
1637+
app.clone(),
1638+
Extension(auth),
1639+
channel_context.clone(),
1640+
Json(req),
1641+
)
1642+
.await
1643+
.expect("should work");
1644+
1645+
let messages = get_validator_messages(
1646+
&app.pool,
1647+
&channel_context.context.id(),
1648+
&Some(IDS[&LEADER]),
1649+
&all_message_types,
1650+
100,
1651+
)
1652+
.await
1653+
.expect("should get messages");
16311654

16321655
assert_eq!(messages.len(), 0);
16331656
}
@@ -1649,10 +1672,26 @@ mod test {
16491672
messages: vec![MessageTypes::Heartbeat(message.clone())],
16501673
};
16511674

1652-
create_validator_messages(app.clone(), Extension(auth), channel_context.clone(), Json(req)).await.expect("Should create messages");
1653-
1654-
let messages = get_validator_messages(&app.pool, &channel_context.context.id(), &Some(IDS[&LEADER]), &all_message_types, 100).await.expect("should get messages");
1655-
let inner_messages: Vec<MessageTypes> = messages.into_iter().map(|m| m.msg.clone()).collect();
1675+
create_validator_messages(
1676+
app.clone(),
1677+
Extension(auth),
1678+
channel_context.clone(),
1679+
Json(req),
1680+
)
1681+
.await
1682+
.expect("Should create messages");
1683+
1684+
let messages = get_validator_messages(
1685+
&app.pool,
1686+
&channel_context.context.id(),
1687+
&Some(IDS[&LEADER]),
1688+
&all_message_types,
1689+
100,
1690+
)
1691+
.await
1692+
.expect("should get messages");
1693+
let inner_messages: Vec<MessageTypes> =
1694+
messages.into_iter().map(|m| m.msg.clone()).collect();
16561695
assert_eq!(inner_messages, vec![MessageTypes::Heartbeat(message)]);
16571696
}
16581697
// Case with 4 messages (one of each type, heartbeat is already inserted)
@@ -1693,12 +1732,31 @@ mod test {
16931732
};
16941733

16951734
let req = ValidatorMessagesCreateRequest {
1696-
messages: vec![MessageTypes::NewState(new_state.clone()), MessageTypes::ApproveState(approve_state.clone()), MessageTypes::RejectState(reject_state.clone())],
1735+
messages: vec![
1736+
MessageTypes::NewState(new_state.clone()),
1737+
MessageTypes::ApproveState(approve_state.clone()),
1738+
MessageTypes::RejectState(reject_state.clone()),
1739+
],
16971740
};
16981741

1699-
create_validator_messages(app.clone(), Extension(auth), channel_context.clone(), Json(req)).await.expect("Should create messages");
1700-
1701-
let messages = get_validator_messages(&app.pool, &channel_context.context.id(), &Some(IDS[&LEADER]), &all_message_types, 100).await.expect("should get messages");
1742+
create_validator_messages(
1743+
app.clone(),
1744+
Extension(auth),
1745+
channel_context.clone(),
1746+
Json(req),
1747+
)
1748+
.await
1749+
.expect("Should create messages");
1750+
1751+
let messages = get_validator_messages(
1752+
&app.pool,
1753+
&channel_context.context.id(),
1754+
&Some(IDS[&LEADER]),
1755+
&all_message_types,
1756+
100,
1757+
)
1758+
.await
1759+
.expect("should get messages");
17021760
assert_eq!(messages.len(), 4);
17031761
}
17041762
}

0 commit comments

Comments
 (0)