Skip to content

Commit 434c306

Browse files
authored
chore(provider)!: rename on_* to connect_* (#2225)
* chore(`provider`): rename builder methods * fix * fmt * fix * nit
1 parent a7ec9f1 commit 434c306

File tree

26 files changed

+404
-197
lines changed

26 files changed

+404
-197
lines changed

crates/contract/src/call.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ impl<P, D, N: Network> CallBuilder<P, D, N> {
160160
///
161161
/// #[tokio::main]
162162
/// async fn main() {
163-
/// let provider = ProviderBuilder::new().on_anvil_with_wallet();
163+
/// let provider = ProviderBuilder::new().connect_anvil_with_wallet();
164164
///
165165
/// let my_contract = Counter::deploy(provider).await.unwrap();
166166
///
@@ -202,7 +202,7 @@ impl<P, D, N: Network> CallBuilder<P, D, N> {
202202
///
203203
/// #[tokio::main]
204204
/// async fn main() {
205-
/// let provider = ProviderBuilder::new().on_anvil_with_wallet();
205+
/// let provider = ProviderBuilder::new().connect_anvil_with_wallet();
206206
///
207207
/// let my_contract = Counter::deploy(&provider).await.unwrap();
208208
///
@@ -328,7 +328,7 @@ impl<P: Provider<N>, N: Network> RawCallBuilder<P, N> {
328328
/// # stringify!(
329329
/// let provider = ...;
330330
/// # );
331-
/// # let provider = alloy_provider::ProviderBuilder::new().on_anvil();
331+
/// # let provider = alloy_provider::ProviderBuilder::new().connect_anvil();
332332
/// let call_builder = MyContract::deploy_builder(&provider)
333333
/// .with_sol_decoder::<MyContract::constructorReturnCall>();
334334
/// let result = call_builder.call().await?;
@@ -635,7 +635,7 @@ mod tests {
635635
}
636636
}
637637

638-
let provider = ProviderBuilder::new().on_anvil();
638+
let provider = ProviderBuilder::new().connect_anvil();
639639
let call_builder = EmptyConstructor::deploy_builder(&provider);
640640
assert_eq!(*call_builder.calldata(), bytes!("6942"));
641641
}
@@ -671,9 +671,8 @@ mod tests {
671671
}
672672

673673
/// Creates a new call_builder to test field modifications, taken from [call_encoding]
674-
#[allow(clippy::type_complexity)]
675674
fn build_call_builder() -> CallBuilder<impl Provider, PhantomData<MyContract::doStuffCall>> {
676-
let provider = ProviderBuilder::new().on_anvil();
675+
let provider = ProviderBuilder::new().connect_anvil();
677676
let contract = MyContract::new(Address::ZERO, provider);
678677
let call_builder = contract.doStuff(U256::ZERO, true).with_cloned_provider();
679678
call_builder
@@ -738,7 +737,7 @@ mod tests {
738737

739738
#[test]
740739
fn call_encoding() {
741-
let provider = ProviderBuilder::new().on_anvil();
740+
let provider = ProviderBuilder::new().connect_anvil();
742741
let contract = MyContract::new(Address::ZERO, &&provider).with_cloned_provider();
743742
let call_builder = contract.doStuff(U256::ZERO, true).with_cloned_provider();
744743
assert_eq!(
@@ -756,7 +755,7 @@ mod tests {
756755

757756
#[test]
758757
fn deploy_encoding() {
759-
let provider = ProviderBuilder::new().on_anvil();
758+
let provider = ProviderBuilder::new().connect_anvil();
760759
let bytecode = &MyContract::BYTECODE[..];
761760
let call_builder = MyContract::deploy_builder(&provider, false);
762761
assert_eq!(
@@ -780,7 +779,7 @@ mod tests {
780779

781780
#[tokio::test(flavor = "multi_thread")]
782781
async fn deploy_and_call() {
783-
let provider = ProviderBuilder::new().on_anvil_with_wallet();
782+
let provider = ProviderBuilder::new().connect_anvil_with_wallet();
784783

785784
let expected_address = provider.default_signer_address().create(0);
786785
let my_contract = MyContract::deploy(provider, true).await.unwrap();
@@ -806,7 +805,7 @@ mod tests {
806805

807806
#[tokio::test(flavor = "multi_thread")]
808807
async fn deploy_and_call_with_priority() {
809-
let provider = ProviderBuilder::new().on_anvil_with_wallet();
808+
let provider = ProviderBuilder::new().connect_anvil_with_wallet();
810809
let counter_contract = Counter::deploy(provider.clone()).await.unwrap();
811810
let max_fee_per_gas: U256 = parse_units("50", "gwei").unwrap().into();
812811
let max_priority_fee_per_gas: U256 = parse_units("0.1", "gwei").unwrap().into();
@@ -859,7 +858,8 @@ mod tests {
859858

860859
let wallet = EthereumWallet::new(pk);
861860

862-
let wallet_provider = ProviderBuilder::new().wallet(wallet).on_http(anvil.endpoint_url());
861+
let wallet_provider =
862+
ProviderBuilder::new().wallet(wallet).connect_http(anvil.endpoint_url());
863863

864864
let contract = SendMoney::deploy(wallet_provider.clone()).await.unwrap();
865865

@@ -870,7 +870,7 @@ mod tests {
870870

871871
assert!(tx.from.is_none());
872872

873-
let std_provider = ProviderBuilder::new().on_http(anvil.endpoint_url());
873+
let std_provider = ProviderBuilder::new().connect_http(anvil.endpoint_url());
874874
let should_fail = std_provider.estimate_gas(tx.clone()).await.is_err();
875875

876876
assert!(should_fail);
@@ -897,7 +897,7 @@ mod tests {
897897
}
898898
}
899899

900-
let provider = ProviderBuilder::new().on_anvil_with_wallet();
900+
let provider = ProviderBuilder::new().connect_anvil_with_wallet();
901901

902902
let contract = RetStruct::deploy(provider.clone()).await.unwrap();
903903

crates/contract/src/error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl Error {
9191
///
9292
/// #[tokio::main]
9393
/// async fn main() {
94-
/// let provider = ProviderBuilder::new().on_anvil_with_wallet();
94+
/// let provider = ProviderBuilder::new().connect_anvil_with_wallet();
9595
///
9696
/// let throws_err = ThrowsError::deploy(provider).await.unwrap();
9797
///
@@ -136,7 +136,7 @@ impl Error {
136136
///
137137
/// #[tokio::main]
138138
/// async fn main() {
139-
/// let provider = ProviderBuilder::new().on_anvil_with_wallet();
139+
/// let provider = ProviderBuilder::new().connect_anvil_with_wallet();
140140
///
141141
/// let throws_err = ThrowsError::deploy(provider).await.unwrap();
142142
///

crates/contract/src/event.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ mod tests {
315315
let wallet = EthereumWallet::from(pk);
316316
let provider = alloy_provider::ProviderBuilder::new()
317317
.wallet(wallet.clone())
318-
.on_http(anvil.endpoint_url());
318+
.connect_http(anvil.endpoint_url());
319319

320320
// let from = address!("f39Fd6e51aad88F6F4ce6aB8827279cffFb92266");
321321
let contract = MyContract::deploy(&provider).await.unwrap();
@@ -423,7 +423,7 @@ mod tests {
423423
let wallet = EthereumWallet::from(pk);
424424
let provider = alloy_provider::ProviderBuilder::new()
425425
.wallet(wallet.clone())
426-
.on_http(anvil.endpoint_url());
426+
.connect_http(anvil.endpoint_url());
427427

428428
let contract = MyContract::deploy(&provider).await.unwrap();
429429

crates/contract/src/instance.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ mod tests {
127127

128128
#[tokio::test]
129129
async fn contract_interface() {
130-
let provider = ProviderBuilder::new().on_anvil_with_wallet();
130+
let provider = ProviderBuilder::new().connect_anvil_with_wallet();
131131

132132
let abi_str = r#"[{"inputs":[],"name":"counter","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"increment","outputs":[],"stateMutability":"nonpayable","type":"function"}]"#;
133133
let abi = serde_json::from_str::<JsonAbi>(abi_str).unwrap();

crates/contract/src/multicall.rs

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ mod tests {
6565
#[tokio::test]
6666
async fn test_single() {
6767
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
68-
let provider = ProviderBuilder::new().on_anvil_with_config(|a| a.fork(FORK_URL));
68+
let provider = ProviderBuilder::new().connect_anvil_with_config(|a| a.fork(FORK_URL));
6969

7070
let erc20 = ERC20::new(weth, &provider);
7171
let multicall = provider.multicall().add(erc20.totalSupply());
@@ -76,7 +76,7 @@ mod tests {
7676
#[tokio::test]
7777
async fn test_aggregate() {
7878
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
79-
let provider = ProviderBuilder::new().on_anvil_with_config(|a| a.fork(FORK_URL));
79+
let provider = ProviderBuilder::new().connect_anvil_with_config(|a| a.fork(FORK_URL));
8080

8181
let erc20 = ERC20::new(weth, &provider);
8282

@@ -96,7 +96,7 @@ mod tests {
9696
#[tokio::test]
9797
async fn test_try_aggregate_pass() {
9898
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
99-
let provider = ProviderBuilder::new().on_anvil_with_config(|a| a.fork(FORK_URL));
99+
let provider = ProviderBuilder::new().connect_anvil_with_config(|a| a.fork(FORK_URL));
100100
let erc20 = ERC20::new(weth, &provider);
101101

102102
let multicall = provider
@@ -113,8 +113,9 @@ mod tests {
113113
async fn aggregate3() {
114114
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
115115

116-
let provider =
117-
ProviderBuilder::new().on_anvil_with_wallet_and_config(|a| a.fork(FORK_URL)).unwrap();
116+
let provider = ProviderBuilder::new()
117+
.connect_anvil_with_wallet_and_config(|a| a.fork(FORK_URL))
118+
.unwrap();
118119

119120
let dummy = deploy_dummy(provider.clone()).await;
120121
let erc20 = ERC20::new(weth, &provider);
@@ -145,8 +146,9 @@ mod tests {
145146
#[tokio::test]
146147
async fn test_try_aggregate_fail() {
147148
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
148-
let provider =
149-
ProviderBuilder::new().on_anvil_with_wallet_and_config(|a| a.fork(FORK_URL)).unwrap();
149+
let provider = ProviderBuilder::new()
150+
.connect_anvil_with_wallet_and_config(|a| a.fork(FORK_URL))
151+
.unwrap();
150152

151153
let dummy_addr = deploy_dummy(provider.clone()).await;
152154
let erc20 = ERC20::new(weth, &provider);
@@ -176,7 +178,7 @@ mod tests {
176178
async fn test_util() {
177179
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
178180
let provider = ProviderBuilder::new()
179-
.on_anvil_with_config(|a| a.fork(FORK_URL).fork_block_number(21787144));
181+
.connect_anvil_with_config(|a| a.fork(FORK_URL).fork_block_number(21787144));
180182
let erc20 = ERC20::new(weth, &provider);
181183
let multicall = provider
182184
.multicall()
@@ -212,8 +214,9 @@ mod tests {
212214

213215
#[tokio::test]
214216
async fn aggregate3_value() {
215-
let provider =
216-
ProviderBuilder::new().on_anvil_with_wallet_and_config(|a| a.fork(FORK_URL)).unwrap();
217+
let provider = ProviderBuilder::new()
218+
.connect_anvil_with_wallet_and_config(|a| a.fork(FORK_URL))
219+
.unwrap();
217220

218221
let payable_counter = PayableCounter::deploy(provider.clone()).await.unwrap();
219222

@@ -258,7 +261,7 @@ mod tests {
258261
#[tokio::test]
259262
async fn test_clear() {
260263
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
261-
let provider = ProviderBuilder::new().on_anvil();
264+
let provider = ProviderBuilder::new().connect_anvil();
262265

263266
let erc20 = ERC20::new(weth, &provider);
264267
let multicall = provider
@@ -273,7 +276,7 @@ mod tests {
273276
#[tokio::test]
274277
async fn add_dynamic() {
275278
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
276-
let provider = ProviderBuilder::new().on_anvil_with_config(|a| a.fork(FORK_URL));
279+
let provider = ProviderBuilder::new().connect_anvil_with_config(|a| a.fork(FORK_URL));
277280

278281
let erc20 = ERC20::new(weth, &provider);
279282

@@ -295,7 +298,7 @@ mod tests {
295298
#[tokio::test]
296299
async fn test_extend_dynamic() {
297300
let weth = address!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2");
298-
let provider = ProviderBuilder::new().on_anvil_with_config(|a| a.fork(FORK_URL));
301+
let provider = ProviderBuilder::new().connect_anvil_with_config(|a| a.fork(FORK_URL));
299302
let erc20 = ERC20::new(weth, &provider);
300303
let ts_calls = vec![erc20.totalSupply(); 18];
301304
let multicall = MulticallBuilder::new_dynamic(provider.clone()).extend(ts_calls);

0 commit comments

Comments
 (0)