Skip to content

Commit 11c6b85

Browse files
committed
fix lint
1 parent de22c14 commit 11c6b85

File tree

6 files changed

+29
-21
lines changed

6 files changed

+29
-21
lines changed

substrate/frame/revive/rpc/examples/deploy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ async fn main() -> anyhow::Result<()> {
3939
println!("\n\n=== Deploying contract ===\n\n");
4040

4141
let nonce = client.get_transaction_count(account.address(), BlockTag::Latest.into()).await?;
42-
let tx = TransactionBuilder::new(&client)
42+
let tx = TransactionBuilder::new(client.clone())
4343
.value(5_000_000_000_000u128.into())
4444
.input(input)
4545
.send()
@@ -65,7 +65,7 @@ async fn main() -> anyhow::Result<()> {
6565
}
6666

6767
println!("\n\n=== Calling contract ===\n\n");
68-
let tx = TransactionBuilder::new(&client)
68+
let tx = TransactionBuilder::new(client.clone())
6969
.value(U256::from(1_000_000u32))
7070
.to(contract_address)
7171
.send()

substrate/frame/revive/rpc/examples/eth-rpc-tester.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ async fn test_eth_rpc(rpc_url: &str) -> anyhow::Result<()> {
141141
println!("- balance: {balance:?}");
142142

143143
println!("\n\n=== Deploying dummy contract ===\n\n");
144-
let tx = TransactionBuilder::new(&client).input(input).send().await?;
144+
let tx = TransactionBuilder::new(client.clone()).input(input).send().await?;
145145

146146
println!("Hash: {:?}", tx.hash());
147147
println!("Waiting for receipt...");
@@ -156,7 +156,7 @@ async fn test_eth_rpc(rpc_url: &str) -> anyhow::Result<()> {
156156
println!("- Address: {contract_address:?}");
157157

158158
println!("\n\n=== Calling dummy contract ===\n\n");
159-
let tx = TransactionBuilder::new(&client).to(contract_address).send().await?;
159+
let tx = TransactionBuilder::new(client.clone()).to(contract_address).send().await?;
160160

161161
println!("Hash: {:?}", tx.hash());
162162
println!("Waiting for receipt...");

substrate/frame/revive/rpc/examples/transfer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ async fn main() -> anyhow::Result<()> {
3939
print_balance().await?;
4040
println!("\n\n=== Transferring ===\n\n");
4141

42-
let tx = TransactionBuilder::new(&client)
42+
let tx = TransactionBuilder::new(client.clone())
4343
.signer(alith)
4444
.value(value)
4545
.to(ethan.address())

substrate/frame/revive/rpc/examples/tx-types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async fn main() -> anyhow::Result<()> {
3535
] {
3636
println!("\n\n=== TransactionType {tx_type:?} ===\n\n",);
3737

38-
let tx = TransactionBuilder::new(&client)
38+
let tx = TransactionBuilder::new(client.clone())
3939
.signer(alith.clone())
4040
.value(value)
4141
.to(ethan.address())

substrate/frame/revive/rpc/src/example.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ impl<Client: EthRpcClient + Sync + Send> SubmittedTransaction<Client> {
8888
}
8989

9090
impl<Client: EthRpcClient + Send + Sync> TransactionBuilder<Client> {
91-
pub fn new(client: &Arc<Client>) -> Self {
91+
pub fn new(client: Arc<Client>) -> Self {
9292
Self {
93-
client: Arc::clone(client),
93+
client,
9494
signer: Account::default(),
9595
value: U256::zero(),
9696
input: Bytes::default(),

substrate/frame/revive/rpc/src/tests.rs

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ async fn prepare_evm_transactions<Client: EthRpcClient + Sync + Send>(
132132
let mut transactions = Vec::new();
133133
for i in (0..count).rev() {
134134
let nonce = start_nonce.saturating_add(U256::from(i as u64));
135-
let tx_builder = TransactionBuilder::new(client)
135+
let tx_builder = TransactionBuilder::new(Arc::clone(client))
136136
.signer(signer.clone())
137137
.nonce(nonce)
138138
.value(amount)
@@ -309,7 +309,11 @@ async fn test_transfer(client: Arc<WsClient>) -> anyhow::Result<()> {
309309
let initial_balance = client.get_balance(ethan.address(), BlockTag::Latest.into()).await?;
310310

311311
let value = 1_000_000_000_000_000_000_000u128.into();
312-
let tx = TransactionBuilder::new(&client).value(value).to(ethan.address()).send().await?;
312+
let tx = TransactionBuilder::new(client.clone())
313+
.value(value)
314+
.to(ethan.address())
315+
.send()
316+
.await?;
313317

314318
let receipt = tx.wait_for_receipt().await?;
315319
assert_eq!(
@@ -335,7 +339,11 @@ async fn test_deploy_and_call(client: Arc<WsClient>) -> anyhow::Result<()> {
335339
let ethan = Account::from(subxt_signer::eth::dev::ethan());
336340
let initial_balance = client.get_balance(ethan.address(), BlockTag::Latest.into()).await?;
337341
let value = 1_000_000_000_000_000_000_000u128.into();
338-
let tx = TransactionBuilder::new(&client).value(value).to(ethan.address()).send().await?;
342+
let tx = TransactionBuilder::new(client.clone())
343+
.value(value)
344+
.to(ethan.address())
345+
.send()
346+
.await?;
339347

340348
let receipt = tx.wait_for_receipt().await?;
341349
assert_eq!(
@@ -358,7 +366,7 @@ async fn test_deploy_and_call(client: Arc<WsClient>) -> anyhow::Result<()> {
358366
let (bytes, _) = pallet_revive_fixtures::compile_module("dummy")?;
359367
let input = bytes.into_iter().chain(data.clone()).collect::<Vec<u8>>();
360368
let nonce = client.get_transaction_count(account.address(), BlockTag::Latest.into()).await?;
361-
let tx = TransactionBuilder::new(&client).value(value).input(input).send().await?;
369+
let tx = TransactionBuilder::new(client.clone()).value(value).input(input).send().await?;
362370
let receipt = tx.wait_for_receipt().await?;
363371
let contract_address = create1(&account.address(), nonce.try_into().unwrap());
364372
assert_eq!(
@@ -379,7 +387,7 @@ async fn test_deploy_and_call(client: Arc<WsClient>) -> anyhow::Result<()> {
379387
);
380388

381389
// Call contract
382-
let tx = TransactionBuilder::new(&client)
390+
let tx = TransactionBuilder::new(client.clone())
383391
.value(value)
384392
.to(contract_address)
385393
.send()
@@ -397,7 +405,7 @@ async fn test_deploy_and_call(client: Arc<WsClient>) -> anyhow::Result<()> {
397405

398406
// Balance transfer to contract
399407
let initial_balance = client.get_balance(contract_address, BlockTag::Latest.into()).await?;
400-
let tx = TransactionBuilder::new(&client)
408+
let tx = TransactionBuilder::new(client.clone())
401409
.value(value)
402410
.to(contract_address)
403411
.send()
@@ -448,7 +456,7 @@ async fn test_runtime_api_dry_run_addr_works(client: Arc<WsClient>) -> anyhow::R
448456
async fn test_invalid_transaction(client: Arc<WsClient>) -> anyhow::Result<()> {
449457
let ethan = Account::from(subxt_signer::eth::dev::ethan());
450458

451-
let err = TransactionBuilder::new(&client)
459+
let err = TransactionBuilder::new(client.clone())
452460
.value(U256::from(1_000_000_000_000u128))
453461
.to(ethan.address())
454462
.mutate(|tx| match tx {
@@ -492,7 +500,7 @@ async fn test_evm_blocks_should_match(client: Arc<WsClient>) -> anyhow::Result<(
492500
// Deploy a contract to have some interesting blocks
493501
let (bytes, _) = pallet_revive_fixtures::compile_module("dummy")?;
494502
let value = U256::from(5_000_000_000_000u128);
495-
let tx = TransactionBuilder::new(&client)
503+
let tx = TransactionBuilder::new(client.clone())
496504
.value(value)
497505
.input(bytes.to_vec())
498506
.send()
@@ -536,7 +544,7 @@ async fn test_evm_blocks_hydrated_should_match(client: Arc<WsClient>) -> anyhow:
536544
let value = U256::from(5_000_000_000_000u128);
537545
let signer = Account::default();
538546
let signer_copy = Account::default();
539-
let tx = TransactionBuilder::new(&client)
547+
let tx = TransactionBuilder::new(client.clone())
540548
.value(value)
541549
.signer(signer)
542550
.input(bytes.to_vec())
@@ -589,7 +597,7 @@ async fn test_block_hash_for_tag_with_proper_ethereum_block_hash_works(
589597
// Deploy a transaction to create a block with transactions
590598
let (bytes, _) = pallet_revive_fixtures::compile_module("dummy")?;
591599
let value = U256::from(5_000_000_000_000u128);
592-
let tx = TransactionBuilder::new(&client)
600+
let tx = TransactionBuilder::new(client.clone())
593601
.value(value)
594602
.input(bytes.to_vec())
595603
.send()
@@ -764,7 +772,7 @@ async fn test_runtime_pallets_address_upload_code(client: Arc<WsClient>) -> anyh
764772
let encoded_call = node_client.tx().call_data(&upload_call)?;
765773

766774
// Step 2: Send the encoded call to RUNTIME_PALLETS_ADDR
767-
let tx = TransactionBuilder::new(&client)
775+
let tx = TransactionBuilder::new(client.clone())
768776
.signer(signer.clone())
769777
.to(pallet_revive::RUNTIME_PALLETS_ADDR)
770778
.input(encoded_call.clone())
@@ -803,12 +811,12 @@ async fn test_fibonacci_large_value_runs_out_of_gas(client: Arc<WsClient>) -> an
803811

804812
let account = Account::default();
805813
let nonce = client.get_transaction_count(account.address(), BlockTag::Latest.into()).await?;
806-
let tx = TransactionBuilder::new(&client).input(bytes.to_vec()).send().await?;
814+
let tx = TransactionBuilder::new(client.clone()).input(bytes.to_vec()).send().await?;
807815
let receipt = tx.wait_for_receipt().await?;
808816
let contract_address = create1(&account.address(), nonce.try_into().unwrap());
809817
assert_eq!(Some(contract_address), receipt.contract_address);
810818

811-
let result = TransactionBuilder::new(&client)
819+
let result = TransactionBuilder::new(client.clone())
812820
.to(contract_address)
813821
.input(Fibonacci::fibCall { n: 100u64 }.abi_encode())
814822
.eth_call()

0 commit comments

Comments
 (0)