Skip to content

Commit 117eb05

Browse files
vorot93vorot93
authored
Merge imports (#420)
1 parent 22c2100 commit 117eb05

39 files changed

+320
-288
lines changed

‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232
uses: actions-rs/cargo@master
3333
with:
3434
command: fmt
35-
args: --all -- --check
35+
args: --all -- --check --config merge_imports=true

‎examples/bench.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use parking_lot::Mutex;
2-
use std::sync::{atomic, Arc};
3-
use std::{thread, time};
2+
use std::{
3+
sync::{atomic, Arc},
4+
thread, time,
5+
};
46

57
#[tokio::main]
68
async fn main() -> web3::Result {

‎examples/contract.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
use hex_literal::hex;
2-
use web3::contract::{Contract, Options};
3-
use web3::types::U256;
2+
use web3::{
3+
contract::{Contract, Options},
4+
types::U256,
5+
};
46

57
#[tokio::main]
68
async fn main() -> web3::contract::Result<()> {

‎examples/contract_log_filter.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
use hex_literal::hex;
22
use std::time;
3-
use web3::contract::{Contract, Options};
4-
use web3::futures::StreamExt;
5-
use web3::types::FilterBuilder;
3+
use web3::{
4+
contract::{Contract, Options},
5+
futures::StreamExt,
6+
types::FilterBuilder,
7+
};
68

79
#[tokio::main]
810
async fn main() -> web3::contract::Result<()> {

‎examples/contract_log_pubsub.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
use hex_literal::hex;
22
use std::time;
3-
use web3::contract::{Contract, Options};
4-
use web3::futures::{future, StreamExt};
5-
use web3::types::FilterBuilder;
3+
use web3::{
4+
contract::{Contract, Options},
5+
futures::{future, StreamExt},
6+
types::FilterBuilder,
7+
};
68

79
#[tokio::main]
810
async fn main() -> web3::contract::Result<()> {

‎examples/contract_storage.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
//based on examples/contract.rs
22

33
use std::time;
4-
use web3::contract::{Contract, Options};
5-
use web3::types::U256;
4+
use web3::{
5+
contract::{Contract, Options},
6+
types::U256,
7+
};
68

79
#[tokio::main]
810
async fn main() -> web3::contract::Result<()> {

‎src/api/accounts.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//! Partial implementation of the `Accounts` namespace.
22
3-
use crate::api::Namespace;
4-
use crate::signing;
5-
use crate::types::H256;
6-
use crate::Transport;
3+
use crate::{api::Namespace, signing, types::H256, Transport};
74

85
/// `Accounts` namespace
96
#[derive(Debug, Clone)]
@@ -46,11 +43,13 @@ impl<T: Transport> Accounts<T> {
4643
#[cfg(feature = "signing")]
4744
mod accounts_signing {
4845
use super::*;
49-
use crate::api::Web3;
50-
use crate::error;
51-
use crate::signing::Signature;
52-
use crate::types::{
53-
Address, Bytes, Recovery, RecoveryMessage, SignedData, SignedTransaction, TransactionParameters, U256,
46+
use crate::{
47+
api::Web3,
48+
error,
49+
signing::Signature,
50+
types::{
51+
Address, Bytes, Recovery, RecoveryMessage, SignedData, SignedTransaction, TransactionParameters, U256,
52+
},
5453
};
5554
use rlp::RlpStream;
5655
use std::convert::TryInto;
@@ -243,14 +242,15 @@ mod accounts_signing {
243242
#[cfg(test)]
244243
mod tests {
245244
use super::*;
246-
use crate::signing::{SecretKey, SecretKeyRef};
247-
use crate::transports::test::TestTransport;
248-
use crate::types::{Address, Recovery, SignedTransaction, TransactionParameters, U256};
245+
use crate::{
246+
signing::{SecretKey, SecretKeyRef},
247+
transports::test::TestTransport,
248+
types::{Address, Recovery, SignedTransaction, TransactionParameters, U256},
249+
};
250+
use accounts_signing::*;
249251
use hex_literal::hex;
250252
use serde_json::json;
251253

252-
use accounts_signing::*;
253-
254254
#[test]
255255
fn accounts_sign_transaction() {
256256
// retrieved test vector from:

‎src/api/eth.rs

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
//! `Eth` namespace
22
3-
use crate::api::Namespace;
4-
use crate::helpers::{self, CallFuture};
5-
use crate::types::{
6-
Address, Block, BlockHeader, BlockId, BlockNumber, Bytes, CallRequest, Filter, Index, Log, SyncState, Transaction,
7-
TransactionId, TransactionReceipt, TransactionRequest, Work, H256, H520, H64, U256, U64,
3+
use crate::{
4+
api::Namespace,
5+
helpers::{self, CallFuture},
6+
types::{
7+
Address, Block, BlockHeader, BlockId, BlockNumber, Bytes, CallRequest, Filter, Index, Log, SyncState,
8+
Transaction, TransactionId, TransactionReceipt, TransactionRequest, Work, H256, H520, H64, U256, U64,
9+
},
10+
Transport,
811
};
9-
use crate::Transport;
1012

1113
/// `Eth` namespace
1214
#[derive(Debug, Clone)]
@@ -349,18 +351,18 @@ impl<T: Transport> Eth<T> {
349351

350352
#[cfg(test)]
351353
mod tests {
354+
use super::Eth;
355+
use crate::{
356+
api::Namespace,
357+
rpc::Value,
358+
types::{
359+
Address, Block, BlockHeader, BlockId, BlockNumber, CallRequest, FilterBuilder, Log, SyncInfo, SyncState,
360+
Transaction, TransactionId, TransactionReceipt, TransactionRequest, Work, H256, H520, H64,
361+
},
362+
};
352363
use hex_literal::hex;
353364
use serde_json::json;
354365

355-
use crate::api::Namespace;
356-
use crate::rpc::Value;
357-
use crate::types::{
358-
Address, Block, BlockHeader, BlockId, BlockNumber, CallRequest, FilterBuilder, Log, SyncInfo, SyncState,
359-
Transaction, TransactionId, TransactionReceipt, TransactionRequest, Work, H256, H520, H64,
360-
};
361-
362-
use super::Eth;
363-
364366
// taken from RPC docs.
365367
const EXAMPLE_BLOCK: &str = r#"{
366368
"number": "0x1b4",

‎src/api/eth_filter.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
//! `Eth` namespace, filters.
22
3+
use crate::{
4+
api::Namespace,
5+
error, helpers, rpc,
6+
types::{Filter, Log, H256},
7+
Transport,
8+
};
39
use futures::{stream, Stream, TryStreamExt};
410
use futures_timer::Delay;
511
use serde::de::DeserializeOwned;
6-
use std::marker::PhantomData;
7-
use std::time::Duration;
8-
use std::{fmt, vec};
9-
10-
use crate::api::Namespace;
11-
use crate::helpers;
12-
use crate::types::{Filter, Log, H256};
13-
use crate::{error, rpc, Transport};
12+
use std::{fmt, marker::PhantomData, time::Duration, vec};
1413

1514
fn filter_stream<T: Transport, I: DeserializeOwned>(
1615
base: BaseFilter<T, I>,
@@ -201,10 +200,12 @@ impl<T: Transport> EthFilter<T> {
201200
#[cfg(test)]
202201
mod tests {
203202
use super::EthFilter;
204-
use crate::api::Namespace;
205-
use crate::rpc::Value;
206-
use crate::transports::test::TestTransport;
207-
use crate::types::{Address, FilterBuilder, Log, H256};
203+
use crate::{
204+
api::Namespace,
205+
rpc::Value,
206+
transports::test::TestTransport,
207+
types::{Address, FilterBuilder, Log, H256},
208+
};
208209
use futures::stream::StreamExt;
209210
use hex_literal::hex;
210211
use std::time::Duration;

‎src/api/eth_subscribe.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
//! `Eth` namespace, subscriptions
22
3-
use crate::api::Namespace;
4-
use crate::helpers;
5-
use crate::types::{BlockHeader, Filter, Log, SyncState, H256};
6-
use crate::{error, DuplexTransport};
3+
use crate::{
4+
api::Namespace,
5+
error, helpers,
6+
types::{BlockHeader, Filter, Log, SyncState, H256},
7+
DuplexTransport,
8+
};
79
use futures::{
810
task::{Context, Poll},
911
Stream,
1012
};
1113
use pin_project::{pin_project, pinned_drop};
12-
use std::marker::PhantomData;
13-
use std::pin::Pin;
14+
use std::{marker::PhantomData, pin::Pin};
1415

1516
/// `Eth` namespace, subscriptions
1617
#[derive(Debug, Clone)]

‎src/api/mod.rs

+20-15
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,26 @@ mod traces;
1313
mod txpool;
1414
mod web3;
1515

16-
pub use self::accounts::Accounts;
17-
pub use self::eth::Eth;
18-
pub use self::eth_filter::{BaseFilter, EthFilter};
19-
pub use self::eth_subscribe::{EthSubscribe, SubscriptionId, SubscriptionStream};
20-
pub use self::net::Net;
21-
pub use self::parity::Parity;
22-
pub use self::parity_accounts::ParityAccounts;
23-
pub use self::parity_set::ParitySet;
24-
pub use self::personal::Personal;
25-
pub use self::traces::Traces;
26-
pub use self::txpool::Txpool;
27-
pub use self::web3::Web3 as Web3Api;
28-
29-
use crate::types::{Bytes, TransactionReceipt, TransactionRequest, U64};
30-
use crate::{confirm, error, DuplexTransport, Transport};
16+
pub use self::{
17+
accounts::Accounts,
18+
eth::Eth,
19+
eth_filter::{BaseFilter, EthFilter},
20+
eth_subscribe::{EthSubscribe, SubscriptionId, SubscriptionStream},
21+
net::Net,
22+
parity::Parity,
23+
parity_accounts::ParityAccounts,
24+
parity_set::ParitySet,
25+
personal::Personal,
26+
traces::Traces,
27+
txpool::Txpool,
28+
web3::Web3 as Web3Api,
29+
};
30+
31+
use crate::{
32+
confirm, error,
33+
types::{Bytes, TransactionReceipt, TransactionRequest, U64},
34+
DuplexTransport, Transport,
35+
};
3136
use futures::Future;
3237
use std::time::Duration;
3338

‎src/api/net.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
//! `Net` namespace
22
3-
use crate::api::Namespace;
4-
use crate::helpers::CallFuture;
5-
use crate::types::U256;
6-
7-
use crate::Transport;
3+
use crate::{api::Namespace, helpers::CallFuture, types::U256, Transport};
84

95
/// `Net` namespace
106
#[derive(Debug, Clone)]
@@ -44,11 +40,8 @@ impl<T: Transport> Net<T> {
4440

4541
#[cfg(test)]
4642
mod tests {
47-
use crate::api::Namespace;
48-
use crate::rpc::Value;
49-
use crate::types::U256;
50-
5143
use super::Net;
44+
use crate::{api::Namespace, rpc::Value, types::U256};
5245

5346
rpc_test! (
5447
Net:version => "net_version";

‎src/api/parity_accounts.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use crate::api::Namespace;
2-
use crate::helpers::{self, CallFuture};
3-
use crate::types::{Address, H256};
4-
use crate::Transport;
1+
use crate::{
2+
api::Namespace,
3+
helpers::{self, CallFuture},
4+
types::{Address, H256},
5+
Transport,
6+
};
57

68
/// `Parity_Accounts` namespace
79
#[derive(Debug, Clone)]
@@ -60,11 +62,9 @@ impl<T: Transport> ParityAccounts<T> {
6062

6163
#[cfg(test)]
6264
mod tests {
63-
use crate::api::Namespace;
64-
use crate::rpc::Value;
65-
use ethereum_types::{Address, H256};
66-
6765
use super::ParityAccounts;
66+
use crate::{api::Namespace, rpc::Value};
67+
use ethereum_types::{Address, H256};
6868

6969
rpc_test! (
7070
ParityAccounts : parity_kill_account, &"9b776baeaf3896657a9ba0db5564623b3e0173e0".parse::<Address>().unwrap(), "123456789"

‎src/api/parity_set.rs

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
use crate::api::Namespace;
2-
use crate::helpers::{self, CallFuture};
3-
use crate::types::{Address, ParityPeerType, H256};
4-
5-
use crate::Transport;
1+
use crate::{
2+
api::Namespace,
3+
helpers::{self, CallFuture},
4+
types::{Address, ParityPeerType, H256},
5+
Transport,
6+
};
67

78
#[derive(Debug, Clone)]
89
/// `Parity_Set` Specific API
@@ -132,9 +133,11 @@ impl<T: Transport> ParitySet<T> {
132133
#[cfg(test)]
133134
mod tests {
134135
use super::ParitySet;
135-
use crate::api::Namespace;
136-
use crate::rpc::Value;
137-
use crate::types::{Address, ParityPeerInfo, ParityPeerType, PeerNetworkInfo, PeerProtocolsInfo, H256};
136+
use crate::{
137+
api::Namespace,
138+
rpc::Value,
139+
types::{Address, ParityPeerInfo, ParityPeerType, PeerNetworkInfo, PeerProtocolsInfo, H256},
140+
};
138141

139142
rpc_test! (
140143
ParitySet:accept_non_reserved_peers => "parity_acceptNonReservedPeers";

‎src/api/personal.rs

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
//! `Personal` namespace
22
3-
use crate::api::Namespace;
4-
use crate::helpers::{self, CallFuture};
5-
use crate::types::{Address, RawTransaction, TransactionRequest, H256};
6-
7-
use crate::Transport;
3+
use crate::{
4+
api::Namespace,
5+
helpers::{self, CallFuture},
6+
types::{Address, RawTransaction, TransactionRequest, H256},
7+
Transport,
8+
};
89

910
/// `Personal` namespace
1011
#[derive(Debug, Clone)]
@@ -80,12 +81,13 @@ impl<T: Transport> Personal<T> {
8081

8182
#[cfg(test)]
8283
mod tests {
83-
use crate::api::Namespace;
84-
use crate::rpc::Value;
85-
use crate::types::{Address, RawTransaction, TransactionRequest};
86-
use hex_literal::hex;
87-
8884
use super::Personal;
85+
use crate::{
86+
api::Namespace,
87+
rpc::Value,
88+
types::{Address, RawTransaction, TransactionRequest},
89+
};
90+
use hex_literal::hex;
8991

9092
const EXAMPLE_TX: &str = r#"{
9193
"raw": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675",

0 commit comments

Comments
 (0)