Skip to content

Commit

Permalink
for clippy of rust 1.83.0
Browse files Browse the repository at this point in the history
  • Loading branch information
yito88 committed Nov 30, 2024
1 parent a719662 commit 31049b1
Show file tree
Hide file tree
Showing 20 changed files with 49 additions and 51 deletions.
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/async_icq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub trait AsyncIcqMethodsExt<Chain> {
fn async_icq(&self, channel_id: &ChannelId, query_json: &str, from: &str) -> Result<(), Error>;
}

impl<'a, Chain: Send> AsyncIcqMethodsExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> AsyncIcqMethodsExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn update_oracle(&self, relayer: &str, fees: &str, init_args: &str) -> Result<(), Error> {
let driver = *self.value();

Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/authz.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub trait AuthzMethodsExt<Chain> {
) -> Result<(), Error>;
}

impl<'a, Chain: Send> AuthzMethodsExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> AuthzMethodsExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn authz_grant(
&self,
granter: &str,
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/crosschainquery.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub trait CrossChainQueryMethodsExt<Chain> {
fn assert_processed_cross_chain_query(&self) -> Result<(), Error>;
}

impl<'a, Chain: Send> CrossChainQueryMethodsExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> CrossChainQueryMethodsExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn assert_pending_cross_chain_query(&self) -> Result<(), Error> {
assert_eventually_succeed(
"waiting for a cross chain query request",
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/fee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pub trait ChainFeeMethodsExt<Chain> {
) -> Result<Vec<IdentifiedPacketFees>, Error>;
}

impl<'a, Chain: Send> ChainFeeMethodsExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> ChainFeeMethodsExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn ibc_token_transfer_with_fee<Counterparty>(
&self,
port_id: &TaggedPortIdRef<'_, Chain, Counterparty>,
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/fee_grant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pub trait FeeGrantMethodsExt<Chain> {
) -> Result<(), Error>;
}

impl<'a, Chain: Send> FeeGrantMethodsExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> FeeGrantMethodsExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn feegrant_grant(
&self,
granter: &str,
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/ica.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub trait InterchainAccountMethodsExt<Chain> {
) -> Result<MonoTagged<Counterparty, WalletAddress>, Error>;
}

impl<'a, Chain: Send> InterchainAccountMethodsExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> InterchainAccountMethodsExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn register_interchain_account_cli<Counterparty>(
&self,
from: &MonoTagged<Chain, &WalletAddress>,
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/proposal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ pub trait ChainProposalMethodsExt {
) -> Result<(), Error>;
}

impl<'a, Chain: Send> ChainProposalMethodsExt for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> ChainProposalMethodsExt for MonoTagged<Chain, &ChainDriver> {
fn query_upgrade_proposal_height(
&self,
grpc_address: &Uri,
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ pub trait ChainTransferMethodsExt<Chain> {
) -> Result<(), Error>;
}

impl<'a, Chain: Send> ChainTransferMethodsExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> ChainTransferMethodsExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn ibc_transfer_token<Counterparty>(
&self,
port_id: &TaggedPortIdRef<Chain, Counterparty>,
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub trait ChainVersionMethodsExt {
fn major_version(&self) -> Result<u64, Error>;
}

impl<'a, Chain: Send> ChainVersionMethodsExt for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> ChainVersionMethodsExt for MonoTagged<Chain, &ChainDriver> {
fn major_version(&self) -> Result<u64, Error> {
major_version(&self.value().command_path)
}
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/ext/wasm_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub trait StoreWasmClientCodeMethodsExt {
) -> Result<String, Error>;
}

impl<'a, Chain: Send> StoreWasmClientCodeMethodsExt for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> StoreWasmClientCodeMethodsExt for MonoTagged<Chain, &ChainDriver> {
fn store_wasm_client_code(
&self,
wasm_path: &Path,
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/chain/tagged.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ pub trait TaggedChainDriverExt<Chain> {
fn query_auth_module(&self, module_name: &str) -> Result<String, Error>;
}

impl<'a, Chain: Send> TaggedChainDriverExt<Chain> for MonoTagged<Chain, &'a ChainDriver> {
impl<Chain: Send> TaggedChainDriverExt<Chain> for MonoTagged<Chain, &ChainDriver> {
fn chain_id(&self) -> TaggedChainIdRef<Chain> {
self.map_ref(|val| &val.chain_id)
}
Expand Down
2 changes: 1 addition & 1 deletion tools/test-framework/src/framework/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pub struct RunBasicTest<'a, Test> {
pub test: &'a Test,
}

impl<'a, Test, Overrides> PrimitiveTest for RunBasicTest<'a, Test>
impl<Test, Overrides> PrimitiveTest for RunBasicTest<'_, Test>
where
Test: BasicTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down
12 changes: 6 additions & 6 deletions tools/test-framework/src/framework/binary/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ where
}
}

impl<'a, Test, Overrides> BinaryNodeTest for RunBinaryChainTest<'a, Test>
impl<Test, Overrides> BinaryNodeTest for RunBinaryChainTest<'_, Test>
where
Test: BinaryChainTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -243,7 +243,7 @@ where
}
}

impl<'a, Test, Overrides> InterchainSecurityChainTest for RunBinaryChainTest<'a, Test>
impl<Test, Overrides> InterchainSecurityChainTest for RunBinaryChainTest<'_, Test>
where
Test: BinaryChainTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -282,7 +282,7 @@ where
}
}

impl<'a, Test: BinaryChainTest> BinaryChainTest for RunTwoWayBinaryChainTest<'a, Test> {
impl<Test: BinaryChainTest> BinaryChainTest for RunTwoWayBinaryChainTest<'_, Test> {
fn run<ChainA: ChainHandle, ChainB: ChainHandle>(
&self,
config: &TestConfig,
Expand Down Expand Up @@ -311,7 +311,7 @@ impl<'a, Test: BinaryChainTest> BinaryChainTest for RunTwoWayBinaryChainTest<'a,
}
}

impl<'a, Test, Overrides> BinaryChainTest for RunWithSupervisor<'a, Test>
impl<Test, Overrides> BinaryChainTest for RunWithSupervisor<'_, Test>
where
Test: BinaryChainTest,
Test: HasOverrides<Overrides = Overrides>,
Expand All @@ -335,7 +335,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunBinaryChainTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunBinaryChainTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand All @@ -346,7 +346,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunTwoWayBinaryChainTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunTwoWayBinaryChainTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand Down
10 changes: 5 additions & 5 deletions tools/test-framework/src/framework/binary/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ where
}
}

impl<'a, Test, Overrides> BinaryConnectionTest for RunBinaryChannelTest<'a, Test>
impl<Test, Overrides> BinaryConnectionTest for RunBinaryChannelTest<'_, Test>
where
Test: BinaryChannelTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -251,7 +251,7 @@ where
}
}

impl<'a, Test: BinaryChannelTest> BinaryChannelTest for RunTwoWayBinaryChannelTest<'a, Test> {
impl<Test: BinaryChannelTest> BinaryChannelTest for RunTwoWayBinaryChannelTest<'_, Test> {
fn run<ChainA: ChainHandle, ChainB: ChainHandle>(
&self,
config: &TestConfig,
Expand Down Expand Up @@ -287,7 +287,7 @@ impl<'a, Test: BinaryChannelTest> BinaryChannelTest for RunTwoWayBinaryChannelTe
}
}

impl<'a, Test, Overrides> BinaryChannelTest for RunWithSupervisor<'a, Test>
impl<Test, Overrides> BinaryChannelTest for RunWithSupervisor<'_, Test>
where
Test: BinaryChannelTest,
Test: HasOverrides<Overrides = Overrides>,
Expand All @@ -312,7 +312,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunBinaryChannelTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunBinaryChannelTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand All @@ -323,7 +323,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunTwoWayBinaryChannelTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunTwoWayBinaryChannelTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand Down
12 changes: 5 additions & 7 deletions tools/test-framework/src/framework/binary/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ where
}
}

impl<'a, Test, Overrides> BinaryChainTest for RunBinaryConnectionTest<'a, Test>
impl<Test, Overrides> BinaryChainTest for RunBinaryConnectionTest<'_, Test>
where
Test: BinaryConnectionTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -174,9 +174,7 @@ where
}
}

impl<'a, Test: BinaryConnectionTest> BinaryConnectionTest
for RunTwoWayBinaryConnectionTest<'a, Test>
{
impl<Test: BinaryConnectionTest> BinaryConnectionTest for RunTwoWayBinaryConnectionTest<'_, Test> {
fn run<ChainA: ChainHandle, ChainB: ChainHandle>(
&self,
config: &TestConfig,
Expand Down Expand Up @@ -212,7 +210,7 @@ impl<'a, Test: BinaryConnectionTest> BinaryConnectionTest
}
}

impl<'a, Test, Overrides> BinaryConnectionTest for RunWithSupervisor<'a, Test>
impl<Test, Overrides> BinaryConnectionTest for RunWithSupervisor<'_, Test>
where
Test: BinaryConnectionTest,
Test: HasOverrides<Overrides = Overrides>,
Expand All @@ -237,7 +235,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunBinaryConnectionTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunBinaryConnectionTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand All @@ -248,7 +246,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunTwoWayBinaryConnectionTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunTwoWayBinaryConnectionTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand Down
4 changes: 2 additions & 2 deletions tools/test-framework/src/framework/binary/ics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ where
}
}

impl<'a, Test, Overrides> BasicTest for RunInterchainSecurityChainTest<'a, Test>
impl<Test, Overrides> BasicTest for RunInterchainSecurityChainTest<'_, Test>
where
Test: InterchainSecurityChainTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -104,7 +104,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunInterchainSecurityChainTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunInterchainSecurityChainTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand Down
8 changes: 4 additions & 4 deletions tools/test-framework/src/framework/binary/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub struct RunSingleNodeTest<'a, Test> {
pub test: &'a Test,
}

impl<'a, Test, Overrides> BasicTest for RunBinaryNodeTest<'a, Test>
impl<Test, Overrides> BasicTest for RunBinaryNodeTest<'_, Test>
where
Test: BinaryNodeTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -180,7 +180,7 @@ where
}
}

impl<'a, Test, Overrides> BasicTest for RunSingleNodeTest<'a, Test>
impl<Test, Overrides> BasicTest for RunSingleNodeTest<'_, Test>
where
Test: BinaryNodeTest,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -221,7 +221,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunBinaryNodeTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunBinaryNodeTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand All @@ -232,7 +232,7 @@ where
}
}

impl<'a, Test, Overrides> HasOverrides for RunSingleNodeTest<'a, Test>
impl<Test, Overrides> HasOverrides for RunSingleNodeTest<'_, Test>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand Down
14 changes: 7 additions & 7 deletions tools/test-framework/src/framework/nary/chain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ pub struct RunSelfConnectedNaryChainTest<'a, Test, const SIZE: usize> {
pub test: &'a Test,
}

impl<'a, Test, Overrides, const SIZE: usize> NaryNodeTest<SIZE> for RunNaryChainTest<'a, Test, SIZE>
impl<Test, Overrides, const SIZE: usize> NaryNodeTest<SIZE> for RunNaryChainTest<'_, Test, SIZE>
where
Test: NaryChainTest<SIZE>,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -161,8 +161,8 @@ where
}
}

impl<'a, Test, Overrides, const SIZE: usize> NaryNodeTest<1>
for RunSelfConnectedNaryChainTest<'a, Test, SIZE>
impl<Test, Overrides, const SIZE: usize> NaryNodeTest<1>
for RunSelfConnectedNaryChainTest<'_, Test, SIZE>
where
Test: NaryChainTest<SIZE>,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -196,7 +196,7 @@ where
}
}

impl<'a, Test, Overrides, const SIZE: usize> NaryChainTest<SIZE> for RunWithSupervisor<'a, Test>
impl<Test, Overrides, const SIZE: usize> NaryChainTest<SIZE> for RunWithSupervisor<'_, Test>
where
Test: NaryChainTest<SIZE>,
Test: HasOverrides<Overrides = Overrides>,
Expand Down Expand Up @@ -238,7 +238,7 @@ where
}
}

impl<'a, Test, Overrides, const SIZE: usize> HasOverrides for RunNaryChainTest<'a, Test, SIZE>
impl<Test, Overrides, const SIZE: usize> HasOverrides for RunNaryChainTest<'_, Test, SIZE>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand All @@ -249,8 +249,8 @@ where
}
}

impl<'a, Test, Overrides, const SIZE: usize> HasOverrides
for RunSelfConnectedNaryChainTest<'a, Test, SIZE>
impl<Test, Overrides, const SIZE: usize> HasOverrides
for RunSelfConnectedNaryChainTest<'_, Test, SIZE>
where
Test: HasOverrides<Overrides = Overrides>,
{
Expand Down
Loading

0 comments on commit 31049b1

Please sign in to comment.