Skip to content

Commit 1d64b4f

Browse files
committed
formatting
1 parent 065a41f commit 1d64b4f

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

adapter/src/ethereum/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use ethsign::{KeyFile, Signature};
1010
use primitives::{Address, BigNum, Chain, ChainId, ChainOf, Channel, Config, ValidatorId};
1111

1212
use super::{
13-
error::{Error, KeystoreError, VerifyError, OutpaceError},
13+
error::{Error, KeystoreError, OutpaceError, VerifyError},
1414
ewt::{self, Payload},
1515
to_ethereum_signed, Electrum, LockedWallet, UnlockedWallet, WalletState, IDENTITY_ABI,
1616
OUTPACE_ABI,

adapter/src/ethereum/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl From<Error> for AdapterError {
2222
err @ Error::ContractInitialization(..) => AdapterError::adapter(err),
2323
err @ Error::ContractQuerying(..) => AdapterError::adapter(err),
2424
err @ Error::VerifyAddress(..) => AdapterError::adapter(err),
25-
err @ Error::OutpaceError( .. ) => AdapterError::adapter(err),
25+
err @ Error::OutpaceError(..) => AdapterError::adapter(err),
2626
err @ Error::AuthenticationTokenNotIntendedForUs { .. } => {
2727
AdapterError::authentication(err)
2828
}
@@ -152,7 +152,7 @@ pub enum EwtVerifyError {
152152
#[error("Error when decoding token signature")]
153153
InvalidSignature,
154154
#[error("Payload error: {0}")]
155-
Payload(#[from] PayloadError)
155+
Payload(#[from] PayloadError),
156156
}
157157

158158
#[derive(Debug, Error)]

primitives/src/channel.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
66

77
use hex::{FromHex, FromHexError};
88

9-
use crate::{Address, Validator, ValidatorId, ToHex};
9+
use crate::{Address, ToHex, Validator, ValidatorId};
1010

1111
#[derive(Deserialize, PartialEq, Eq, Copy, Clone, Hash)]
1212
#[serde(transparent)]
13-
pub struct ChannelId(
14-
#[serde(
15-
deserialize_with = "deserialize_channel_id",
16-
)]
17-
[u8; 32],
18-
);
13+
pub struct ChannelId(#[serde(deserialize_with = "deserialize_channel_id")] [u8; 32]);
1914

2015
impl ChannelId {
2116
pub fn as_bytes(&self) -> &[u8; 32] {

sentry/src/db/analytics.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -337,20 +337,25 @@ mod test {
337337

338338
// 8.12.2021 23:00
339339
let click_ad_slot_2 = make_click_analytics(&ad_unit, ad_slot_ipfs_2, 8, 23);
340-
let click_ad_slot_2 = update_analytics(&database.pool, click_ad_slot_2).await.expect("Should update");
341-
340+
let click_ad_slot_2 = update_analytics(&database.pool, click_ad_slot_2)
341+
.await
342+
.expect("Should update");
342343

343344
// 9.12.2021 00:00
344-
let mut impression_new_slot_type = make_impression_analytics(&ad_unit, ad_slot_ipfs_2, 9, 0);
345+
let mut impression_new_slot_type =
346+
make_impression_analytics(&ad_unit, ad_slot_ipfs_2, 9, 0);
345347
impression_new_slot_type.ad_slot_type = Some("legacy_500x500".to_string());
346-
let impression_new_slot_type = update_analytics(&database.pool, impression_new_slot_type).await.expect("Should update");
348+
let impression_new_slot_type =
349+
update_analytics(&database.pool, impression_new_slot_type)
350+
.await
351+
.expect("Should update");
347352

348353
vec![
349354
("click_germany", click_germany),
350355
("impression_ad_unit_2", impression_ad_unit_2),
351356
("impression_publisher_2", impression_publisher_2),
352357
("click_ad_slot_2", click_ad_slot_2),
353-
("impression_new_slot_type", impression_new_slot_type)
358+
("impression_new_slot_type", impression_new_slot_type),
354359
]
355360
.into_iter()
356361
.collect()
@@ -891,11 +896,7 @@ mod test {
891896
.await
892897
.expect("Should fetch");
893898

894-
assert_eq!(
895-
1,
896-
count_clicks.len(),
897-
"Only single analytics is expected"
898-
);
899+
assert_eq!(1, count_clicks.len(), "Only single analytics is expected");
899900
let fetched = count_clicks.get(0).expect("Should have index 0");
900901
assert_eq!(
901902
23,

0 commit comments

Comments
 (0)