Skip to content

Commit 41cda8f

Browse files
committed
Formatting
1 parent 6754f06 commit 41cda8f

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

crates/ibc/src/msg.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ use ibc::core::channel::types::packet::Packet;
1515
use ibc::core::handler::types::msgs::MsgEnvelope;
1616
use ibc::core::host::types::identifiers::PortId;
1717
use ibc::primitives::proto::Protobuf;
18-
use serde::{Deserialize, Serialize};
1918
use namada_core::string_encoding::StringEncoded;
2019
use namada_systems::ibc::IbcShieldingData;
20+
use serde::{Deserialize, Serialize};
21+
2122
use crate::trace;
2223

2324
trait Sealed {}
@@ -231,7 +232,6 @@ impl<Transfer: BorshSchema> BorshSchema for MsgNftTransfer<Transfer> {
231232
}
232233
}
233234

234-
235235
/// Extract MASP transaction from IBC envelope
236236
pub fn extract_masp_tx_from_envelope(
237237
envelope: &MsgEnvelope,

crates/shielded_token/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ impl Default for ShieldedParams {
7878
locked_amount_target: 10_000_u64,
7979
}
8080
}
81-
}
81+
}

crates/shielded_token/src/vp.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ use namada_core::uint::I320;
2929
use namada_state::{
3030
ConversionState, OptionExt, ReadConversionState, ResultExt,
3131
};
32-
use namada_systems::{governance, ibc, parameters, trans_token};
3332
use namada_systems::ibc::IbcShieldingData;
33+
use namada_systems::{governance, ibc, parameters, trans_token};
3434
use namada_tx::{BatchedTxRef, Signer};
3535
use namada_vp_env::{Error, Result, VpEnv};
3636

@@ -140,9 +140,7 @@ where
140140
+ ReadConversionState,
141141
Params: parameters::Read<<CTX as VpEnv<'ctx>>::Pre>,
142142
Gov: governance::Read<<CTX as VpEnv<'ctx>>::Pre>,
143-
Ibc: ibc::Read<
144-
<CTX as VpEnv<'ctx>>::Post,
145-
>,
143+
Ibc: ibc::Read<<CTX as VpEnv<'ctx>>::Post>,
146144
TransToken:
147145
trans_token::Keys + trans_token::Read<<CTX as VpEnv<'ctx>>::Pre>,
148146
Transfer: BorshDeserialize,
@@ -699,7 +697,8 @@ where
699697
) = action
700698
{
701699
Some(Cow::Borrowed(addr))
702-
} else if let namada_tx::action::Action::IbcShielding ( data ) = action
700+
} else if let namada_tx::action::Action::IbcShielding(data) =
701+
action
703702
{
704703
data.get_signer().map(|s| Cow::Owned(Address::from(s)))
705704
} else {

crates/systems/src/ibc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
use std::collections::{BTreeMap, BTreeSet};
44
use std::fmt;
55
use std::str::FromStr;
6+
7+
use borsh::{BorshDeserialize, BorshSerialize};
68
use masp_primitives::transaction::TransparentAddress;
79
use masp_primitives::transaction::components::ValueSum;
810
use namada_core::address::Address;
9-
use borsh::{BorshDeserialize, BorshSerialize};
10-
use namada_core::masp::{MaspTransaction, TAddrData};
11-
use namada_core::{masp_primitives, storage, token};
1211
use namada_core::borsh::BorshSerializeExt;
1312
use namada_core::bytes::HEXUPPER;
1413
use namada_core::key::common;
14+
use namada_core::masp::{MaspTransaction, TAddrData};
15+
use namada_core::{masp_primitives, storage, token};
1516
pub use namada_storage::Result;
1617
use namada_tx::{Authorization, Signer};
1718

@@ -67,7 +68,6 @@ impl FromStr for IbcShieldingData {
6768

6869
/// Abstract IBC storage read interface
6970
pub trait Read<S> {
70-
7171
/// Extract MASP transaction from IBC envelope
7272
fn try_extract_masp_tx_from_envelope<Transfer: BorshDeserialize>(
7373
tx_data: &[u8],

0 commit comments

Comments
 (0)