fix(core): check against ethers internal crate names (#1060)

* fix(core): check against ethers internal crate names

* fix: add import back
This commit is contained in:
Matthias Seitz 2022-03-17 23:14:53 +01:00 committed by GitHub
parent 2af28be283
commit 3d4feccabf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 8 deletions

View File

@ -382,7 +382,7 @@ fn can_handle_underscore_numeric() {
_100pct(string)
]"#
);
let call = _100PctCall("message".to_string());
let _call = _100PctCall("message".to_string());
let provider = Arc::new(Provider::new(MockProvider::new()));
let contract = Test::new(Address::default(), Arc::clone(&provider));

View File

@ -69,9 +69,18 @@ pub fn determine_ethers_crates() -> (&'static str, &'static str, &'static str) {
.and_then(|metadata| {
metadata.root_package().and_then(|pkg| {
let sub_crates = Some(("ethers_core", "ethers_contract", "ethers_providers"));
if pkg.name == "ethers-contract" {
// Note(mattsse): this is super hacky but required in order to compile the tests
// in the `ethers-contract` crate
// Note(mattsse): this is super hacky but required in order to compile and test
// ethers' internal crates
if [
"ethers-contract",
"ethers-derive-eip712",
"ethers-signers",
"ethers-middleware",
"ethers-solc",
]
.contains(&pkg.name.as_str())
{
return sub_crates
}

View File

@ -601,7 +601,7 @@ mod tests {
let balances = client
.get_ether_balance_multi(
&vec![&"0x58eB28A67731c570Ef827C365c89B5751F9E6b0a".parse().unwrap()],
&[&"0x58eB28A67731c570Ef827C365c89B5751F9E6b0a".parse().unwrap()],
None,
)
.await;

View File

@ -57,7 +57,7 @@ mod tests {
},
],
};
st.write_to(&tempdir.path()).unwrap();
st.write_to(tempdir.path()).unwrap();
let written_paths = read_dir(tempdir.path()).unwrap();
let paths: Vec<PathBuf> =
written_paths.into_iter().filter_map(|x| x.ok()).map(|x| x.path()).collect();
@ -83,7 +83,7 @@ mod tests {
},
],
};
st.write_to(&tempdir.path()).unwrap();
st.write_to(tempdir.path()).unwrap();
let written_paths = read_dir(tempdir.path()).unwrap();
let paths: Vec<PathBuf> =
written_paths.into_iter().filter_map(|x| x.ok()).map(|x| x.path()).collect();

View File

@ -1,5 +1,5 @@
#![cfg(not(target_arch = "wasm32"))]
use ethers_providers::{Http, Middleware, Provider, RINKEBY};
use ethers_providers::{Http, Middleware, Provider};
use std::{convert::TryFrom, time::Duration};
#[cfg(not(feature = "celo"))]
@ -9,6 +9,7 @@ mod eth_tests {
types::{Address, BlockId, TransactionRequest, H256},
utils::Ganache,
};
use ethers_providers::RINKEBY;
#[tokio::test]
async fn non_existing_data_works() {