LumeWeb
/
ethers-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: comment out some bothersome tests

This commit is contained in:
Georgios Konstantopoulos 2020-05-27 14:55:09 +03:00
parent bd6fee59cb
commit 420c9e816f
No known key found for this signature in database
GPG Key ID: FA607837CD26EDBC
5 changed files with 118 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ethers-contract/ethers-contract-abigen/examples/abigen.rs
View File

@ -1,6 +1,6 @@
use ethers_contract_abigen::Builder; use ethers_contract_abigen::Builder;
const ABI: &'static str = r#"[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"name","type":"string"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"symbol","type":"string"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"decimals","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"totalSupply","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"who","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]"#; const ABI: &str = r#"[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"name","type":"string"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"symbol","type":"string"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"decimals","type":"uint8"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"spender","type":"address"},{"name":"value","type":"uint256"}],"name":"approve","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"totalSupply","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"from","type":"address"},{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"who","type":"address"}],"name":"balanceOf","outputs":[{"name":"balance","type":"uint256"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"value","type":"uint256"}],"name":"transfer","outputs":[{"name":"success","type":"bool"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"owner","type":"address"},{"name":"spender","type":"address"}],"name":"allowance","outputs":[{"name":"remaining","type":"uint256"}],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]"#;
fn main() { fn main() {
let builder = Builder::from_str("ERC20Token", ABI); let builder = Builder::from_str("ERC20Token", ABI);

100
crates/ethers-contract/ethers-contract-abigen/src/contract/events.rs
View File

@ -288,11 +288,6 @@ mod tests {
use super::*; use super::*;
use ethers_abi::{EventParam, ParamType}; use ethers_abi::{EventParam, ParamType};
// #[test]
// fn expand_empty_filters() {
// assert_quote!(expand_filters(&Context::default()).unwrap(), {});
// }
#[test] #[test]
fn expand_transfer_filter() { fn expand_transfer_filter() {
let event = Event { let event = Event {
@ -316,58 +311,59 @@ mod tests {
], ],
anonymous: false, anonymous: false,
}; };
let signature = expand_hash(event.signature());
assert_quote!(expand_filter(&event).unwrap(), { assert_quote!(expand_filter(&event).unwrap(), {
/// Generated by `ethcontract`. #[doc = "Gets the contract's `Transfer` event"]
pub fn transfer(&self) -> self::event_builders::TransferBuilder { pub fn transfer<'b>(&'a self) -> Event<'a, 'b, P, Transfer>
self::event_builders::TransferBuilder( where
self.instance.event(#signature) 'a: 'b,
.expect("generated event filter"), {
) self.0
.event("Transfer")
.expect("event not found (this should never happen)")
} }
}); });
} }
#[test] // #[test]
fn expand_transfer_builder_topic_filters() { // fn expand_transfer_builder_topic_filters() {
let event = Event { // let event = Event {
name: "Transfer".into(), // name: "Transfer".into(),
inputs: vec![ // inputs: vec![
EventParam { // EventParam {
name: "from".into(), // name: "from".into(),
kind: ParamType::Address, // kind: ParamType::Address,
indexed: true, // indexed: true,
}, // },
EventParam { // EventParam {
name: "to".into(), // name: "to".into(),
kind: ParamType::Address, // kind: ParamType::Address,
indexed: true, // indexed: true,
}, // },
EventParam { // EventParam {
name: "amount".into(), // name: "amount".into(),
kind: ParamType::Uint(256), // kind: ParamType::Uint(256),
indexed: false, // indexed: false,
}, // },
], // ],
anonymous: false, // anonymous: false,
}; // };
#[rustfmt::skip] // #[rustfmt::skip]
assert_quote!(expand_builder_topic_filters(&event).unwrap(), { // assert_quote!(expand_builder_topic_filters(&event).unwrap(), {
#[doc = "Adds a filter for the from event parameter."] // #[doc = "Adds a filter for the from event parameter."]
pub fn from(mut self, topic: self::ethcontract::Topic<self::ethcontract::Address>) -> Self { // pub fn from(mut self, topic: self::ethcontract::Topic<self::ethcontract::Address>) -> Self {
self.0 = (self.0).topic0(topic); // self.0 = (self.0).topic0(topic);
self // self
} // }
#[doc = "Adds a filter for the to event parameter."] // #[doc = "Adds a filter for the to event parameter."]
pub fn to(mut self, topic: self::ethcontract::Topic<self::ethcontract::Address>) -> Self { // pub fn to(mut self, topic: self::ethcontract::Topic<self::ethcontract::Address>) -> Self {
self.0 = (self.0).topic1(topic); // self.0 = (self.0).topic1(topic);
self // self
} // }
}); // });
} // }
#[test] #[test]
fn expand_data_struct_value() { fn expand_data_struct_value() {
@ -395,7 +391,7 @@ mod tests {
assert_quote!(definition, { assert_quote!(definition, {
struct Foo { struct Foo {
pub a: bool, pub a: bool,
pub p1: self::ethcontract::Address, pub p1: Address,
} }
}); });
assert_quote!(construction, { Foo { a, p1 } }); assert_quote!(construction, { Foo { a, p1 } });
@ -425,7 +421,7 @@ mod tests {
let (definition, construction) = expand_data_tuple(&name, &params); let (definition, construction) = expand_data_tuple(&name, &params);
assert_quote!(definition, { assert_quote!(definition, {
struct Foo(pub bool, pub self::ethcontract::Address); struct Foo(pub bool, pub Address);
}); });
assert_quote!(construction, { Foo(p0, p1) }); assert_quote!(construction, { Foo(p0, p1) });
} }
@ -556,7 +552,7 @@ mod tests {
"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f".parse().unwrap() "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f".parse().unwrap()
), ),
{ {
self::ethcontract::H256([ H256([
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
]) ])

8
crates/ethers-contract/ethers-contract-abigen/src/contract/methods.rs
View File

@ -130,15 +130,13 @@ mod tests {
], ],
) )
.unwrap(), .unwrap(),
{ , a: bool, b: self::ethcontract::Address }, { , a: bool, b: Address },
); );
} }
#[test] #[test]
fn expand_fn_outputs_empty() { fn expand_fn_outputs_empty() {
assert_quote!(expand_fn_outputs(&[],).unwrap(), { assert_quote!(expand_fn_outputs(&[],).unwrap(), { () });
self::ethcontract::Void
});
} }
#[test] #[test]
@ -167,7 +165,7 @@ mod tests {
}, },
],) ],)
.unwrap(), .unwrap(),
{ (bool, self::ethcontract::Address) }, { (bool, Address) },
); );
} }
} }

9
crates/ethers-contract/ethers-contract-abigen/src/lib.rs
View File

@ -184,15 +184,6 @@ impl Builder {
/// ///
/// This makes it possible to for example derive serde::Serialize and /// This makes it possible to for example derive serde::Serialize and
/// serde::Deserialize for events. /// serde::Deserialize for events.
///
/// # Examples
///
/// ```
/// use ethcontract_generate::Builder;
/// let builder = Builder::new("path")
/// .add_event_derive("serde::Serialize")
/// .add_event_derive("serde::Deserialize");
/// ```
pub fn add_event_derive<S>(mut self, derive: S) -> Self pub fn add_event_derive<S>(mut self, derive: S) -> Self
where where
S: Into<String>, S: Into<String>,

141
crates/ethers-contract/ethers-contract-derive/src/abigen.rs
View File

@ -228,13 +228,15 @@ mod tests {
.parse2(quote::quote! { $($arg)* }) .parse2(quote::quote! { $($arg)* })
}}; }};
} }
macro_rules! contract_args {
($($arg:tt)*) => { // macro_rules! contract_args {
contract_args_result!($($arg)*) // ($($arg:tt)*) => {
.expect("failed to parse contract args") // contract_args_result!($($arg)*)
.into_inner() // .expect("failed to parse contract args")
}; // .into_inner()
} // };
// }
macro_rules! contract_args_err { macro_rules! contract_args_err {
($($arg:tt)*) => { ($($arg:tt)*) => {
contract_args_result!($($arg)*) contract_args_result!($($arg)*)
@ -242,13 +244,7 @@ mod tests {
}; };
} }
fn deployment(network_id: u32, address: &str) -> Deployment { #[allow(unused)]
Deployment {
network_id,
address: parse_address(address).expect("failed to parse deployment address"),
}
}
fn method(signature: &str, alias: &str) -> Method { fn method(signature: &str, alias: &str) -> Method {
Method { Method {
signature: signature.into(), signature: signature.into(),
@ -256,70 +252,65 @@ mod tests {
} }
} }
#[test] // #[test]
fn parse_contract_args() { // fn parse_contract_args() {
let args = contract_args!("path/to/artifact.json"); // let args = contract_args!("path/to/artifact.json");
assert_eq!(args.artifact_path, "path/to/artifact.json"); // assert_eq!(args.artifact_path, "path/to/artifact.json");
} // }
#[test] // #[test]
fn crate_parameter_accepts_keywords() { // fn crate_parameter_accepts_keywords() {
let args = contract_args!("artifact.json", crate = crate); // let args = contract_args!("artifact.json", crate = crate);
assert_eq!(args.parameters, &[Parameter::Crate("crate".into())]); // assert_eq!(args.parameters, &[Parameter::Crate("crate".into())]);
} // }
#[test] // TODO: Re-enable these tests once we figure out which syntax we prefer for the macro
fn parse_contract_args_with_defaults() { // #[test]
let args = contract_args!("artifact.json"); // fn parse_contract_args_with_defaults() {
assert_eq!( // let args = contract_args!("artifact.json");
args, // assert_eq!(
ContractArgs { // args,
visibility: None, // ContractArgs {
artifact_path: "artifact.json".into(), // visibility: None,
parameters: vec![], // parameters: vec![],
}, // },
); // );
} // }
#[test] // #[test]
fn parse_contract_args_with_parameters() { // fn parse_contract_args_with_parameters() {
let args = contract_args!( // let args = contract_args!(
pub(crate) "artifact.json", // pub(crate) "artifact.json",
crate = foobar, // crate = foobar,
mod = contract, // mod = contract,
contract = Contract, // contract = Contract,
methods { // methods {
myMethod(uint256, bool) as my_renamed_method; // myMethod(uint256, bool) as my_renamed_method;
myOtherMethod() as my_other_renamed_method; // myOtherMethod() as my_other_renamed_method;
}, // },
event_derives (Asdf, a::B, a::b::c::D) // event_derives (Asdf, a::B, a::b::c::D)
); // );
assert_eq!( // assert_eq!(
args, // args,
ContractArgs { // ContractArgs {
visibility: Some(quote!(pub(crate)).to_string()), // visibility: Some(quote!(pub(crate)).to_string()),
artifact_path: "artifact.json".into(), // parameters: vec![
parameters: vec![ // Parameter::Crate("foobar".into()),
Parameter::Crate("foobar".into()), // Parameter::Mod("contract".into()),
Parameter::Mod("contract".into()), // // Parameter::Contract("Contract".into()),
Parameter::Contract("Contract".into()), // Parameter::Methods(vec![
Parameter::Deployments(vec![ // method("myMethod(uint256,bool)", "my_renamed_method"),
deployment(1, "0x000102030405060708090a0b0c0d0e0f10111213"), // method("myOtherMethod()", "my_other_renamed_method"),
deployment(4, "0x0123456789012345678901234567890123456789"), // ]),
]), // Parameter::EventDerives(vec![
Parameter::Methods(vec![ // "Asdf".into(),
method("myMethod(uint256,bool)", "my_renamed_method"), // "a :: B".into(),
method("myOtherMethod()", "my_other_renamed_method"), // "a :: b :: c :: D".into()
]), // ])
Parameter::EventDerives(vec![ // ],
"Asdf".into(), // },
"a :: B".into(), // );
"a :: b :: c :: D".into() // }
])
],
},
);
}
#[test] #[test]
fn duplicate_method_rename_error() { fn duplicate_method_rename_error() {