diff --git a/Cargo.toml b/Cargo.toml index 084ca827c92..2cc9e1eee97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -160,3 +160,10 @@ serial_test = "3.0" similar-asserts = "1.5" tempfile = "3.10" tower-http = "0.6.1" + +[patch.crates-io] +alloy-core = { git = "https://github.com/alloy-rs/core", branch = "yash/fix-fn-ret" } +alloy-dyn-abi = { git = "https://github.com/alloy-rs/core", branch = "yash/fix-fn-ret" } +alloy-json-abi = { git = "https://github.com/alloy-rs/core", branch = "yash/fix-fn-ret" } +alloy-primitives = { git = "https://github.com/alloy-rs/core", branch = "yash/fix-fn-ret" } +alloy-sol-types = { git = "https://github.com/alloy-rs/core", branch = "yash/fix-fn-ret" } diff --git a/crates/contract/src/call.rs b/crates/contract/src/call.rs index a043dc6f665..4db3749896b 100644 --- a/crates/contract/src/call.rs +++ b/crates/contract/src/call.rs @@ -736,18 +736,18 @@ mod tests { let my_state_builder = my_contract.myState(); assert_eq!(my_state_builder.calldata()[..], MyContract::myStateCall {}.abi_encode(),); - let result: MyContract::myStateReturn = my_state_builder.call().await.unwrap(); - assert!(result.myState); + let my_state = my_state_builder.call().await.unwrap(); + assert!(my_state); let do_stuff_builder = my_contract.doStuff(U256::from(0x69), true); assert_eq!( do_stuff_builder.calldata()[..], MyContract::doStuffCall { a: U256::from(0x69), b: true }.abi_encode(), ); - let result: MyContract::doStuffReturn = do_stuff_builder.call().await.unwrap(); - assert_eq!(result.c, address!("0000000000000000000000000000000000000069")); + let res = do_stuff_builder.call().await.unwrap(); + assert_eq!(res.c, address!("0000000000000000000000000000000000000069")); assert_eq!( - result.d, + res.d, b256!("0000000000000000000000000000000000000000000000000000000000000001"), ); }