difftreelog
fix unit tests
in: master
6 files changed
crates/evm-coder/src/abi/test.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/test.rs
+++ b/crates/evm-coder/src/abi/test.rs
@@ -39,22 +39,22 @@
#[test]
fn encode_decode_uint8() {
- test_impl_uint!(uint8);
+ test_impl_uint!(u8);
}
#[test]
fn encode_decode_uint32() {
- test_impl_uint!(uint32);
+ test_impl_uint!(u32);
}
#[test]
fn encode_decode_uint128() {
- test_impl_uint!(uint128);
+ test_impl_uint!(u128);
}
#[test]
fn encode_decode_uint256() {
- test_impl::<uint256>(
+ test_impl::<U256>(
0xdeadbeef,
U256([255, 0, 0, 0]),
&hex!(
@@ -101,7 +101,7 @@
#[test]
fn encode_decode_vec_tuple_address_uint256() {
- test_impl::<Vec<(address, uint256)>>(
+ test_impl::<Vec<(address, U256)>>(
0x1ACF2D55,
vec![
(
@@ -138,7 +138,7 @@
#[test]
fn encode_decode_vec_tuple_uint256_string() {
- test_impl::<Vec<(uint256, string)>>(
+ test_impl::<Vec<(U256, string)>>(
0xdeadbeef,
vec![
(1.into(), "Test URI 0".to_string()),
@@ -261,7 +261,7 @@
let (call, mut decoder) = AbiReader::new_call(encoded_data).unwrap();
assert_eq!(call, u32::to_be_bytes(decoded_data.0));
let address = decoder.address().unwrap();
- let data = <Vec<(uint256, string)>>::abi_read(&mut decoder).unwrap();
+ let data = <Vec<(U256, string)>>::abi_read(&mut decoder).unwrap();
assert_eq!(data, decoded_data.1);
let mut writer = AbiWriter::new_call(decoded_data.0);
crates/evm-coder/tests/conditional_is.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/conditional_is.rs
+++ b/crates/evm-coder/tests/conditional_is.rs
@@ -4,14 +4,14 @@
#[solidity_interface(name = A)]
impl Contract {
- fn method_a() -> Result<void> {
+ fn method_a() -> Result<()> {
Ok(())
}
}
#[solidity_interface(name = B)]
impl Contract {
- fn method_b() -> Result<void> {
+ fn method_b() -> Result<()> {
Ok(())
}
}
crates/evm-coder/tests/generics.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/generics.rs
+++ b/crates/evm-coder/tests/generics.rs
@@ -16,19 +16,20 @@
use std::marker::PhantomData;
use evm_coder::{execution::Result, generate_stubgen, solidity_interface, types::*};
+use primitive_types::U256;
pub struct Generic<T>(PhantomData<T>);
#[solidity_interface(name = GenericIs)]
impl<T> Generic<T> {
- fn test_1(&self) -> Result<uint256> {
+ fn test_1(&self) -> Result<U256> {
unreachable!()
}
}
#[solidity_interface(name = Generic, is(GenericIs))]
impl<T: Into<u32>> Generic<T> {
- fn test_2(&self) -> Result<uint256> {
+ fn test_2(&self) -> Result<U256> {
unreachable!()
}
}
@@ -40,7 +41,7 @@
where
T: core::fmt::Debug,
{
- fn test_3(&self) -> Result<uint256> {
+ fn test_3(&self) -> Result<U256> {
unreachable!()
}
}
crates/evm-coder/tests/log.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/log.rs
+++ b/crates/evm-coder/tests/log.rs
@@ -17,6 +17,7 @@
#![allow(dead_code)]
use evm_coder::{ToLog, types::*};
+use primitive_types::U256;
#[derive(ToLog)]
enum ERC721Log {
@@ -25,11 +26,11 @@
from: address,
#[indexed]
to: address,
- value: uint256,
+ value: U256,
},
Eee {
#[indexed]
aaa: address,
- bbb: uint256,
+ bbb: U256,
},
}
crates/evm-coder/tests/random.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![allow(dead_code)] // This test only checks that macros is not panicking1819use evm_coder::{20 abi::AbiType, ToLog, execution::Result, solidity_interface, types::*, solidity, weight,21};2223pub struct Impls;2425#[solidity_interface(name = OurInterface)]26impl Impls {27 fn fn_a(&self, _input: uint256) -> Result<bool> {28 unreachable!()29 }30}3132#[solidity_interface(name = OurInterface1)]33impl Impls {34 fn fn_b(&self, _input: uint128) -> Result<uint32> {35 unreachable!()36 }37}3839#[derive(ToLog)]40enum OurEvents {41 Event1 {42 field1: uint32,43 },44 Event2 {45 field1: uint32,46 #[indexed]47 field2: uint32,48 },49}5051#[solidity_interface(52 name = OurInterface2,53 is(OurInterface),54 inline_is(OurInterface1),55 events(OurEvents)56)]57impl Impls {58 #[solidity(rename_selector = "fnK")]59 fn fn_c(&self, _input: uint32) -> Result<uint8> {60 unreachable!()61 }62 fn fn_d(&self, _value: uint32) -> Result<uint32> {63 unreachable!()64 }6566 fn caller_sensitive(&self, _caller: caller) -> Result<uint8> {67 unreachable!()68 }69 fn payable(&mut self, _value: value) -> Result<uint8> {70 unreachable!()71 }7273 #[weight(*_weight)]74 fn with_weight(&self, _weight: uint64) -> Result<void> {75 unreachable!()76 }7778 /// Doccoment example79 fn with_doc(&self) -> Result<void> {80 unreachable!()81 }82}8384#[solidity_interface(85 name = ValidSelector,86 expect_selector = 0x00000000,87)]88impl Impls {}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![allow(dead_code)] // This test only checks that macros is not panicking1819use evm_coder::{20 abi::AbiType, ToLog, execution::Result, solidity_interface, types::*, solidity, weight,21};22use primitive_types::U256;2324pub struct Impls;2526#[solidity_interface(name = OurInterface)]27impl Impls {28 fn fn_a(&self, _input: U256) -> Result<bool> {29 unreachable!()30 }31}3233#[solidity_interface(name = OurInterface1)]34impl Impls {35 fn fn_b(&self, _input: u128) -> Result<u32> {36 unreachable!()37 }38}3940#[derive(ToLog)]41enum OurEvents {42 Event1 {43 field1: u32,44 },45 Event2 {46 field1: u32,47 #[indexed]48 field2: u32,49 },50}5152#[solidity_interface(53 name = OurInterface2,54 is(OurInterface),55 inline_is(OurInterface1),56 events(OurEvents)57)]58impl Impls {59 #[solidity(rename_selector = "fnK")]60 fn fn_c(&self, _input: u32) -> Result<u8> {61 unreachable!()62 }63 fn fn_d(&self, _value: u32) -> Result<u32> {64 unreachable!()65 }6667 fn caller_sensitive(&self, _caller: caller) -> Result<u8> {68 unreachable!()69 }70 fn payable(&mut self, _value: value) -> Result<u8> {71 unreachable!()72 }7374 #[weight(*_weight)]75 fn with_weight(&self, _weight: u64) -> Result<()> {76 unreachable!()77 }7879 /// Doccoment example80 fn with_doc(&self) -> Result<()> {81 unreachable!()82 }83}8485#[solidity_interface(86 name = ValidSelector,87 expect_selector = 0x00000000,88)]89impl Impls {}crates/evm-coder/tests/solidity_generation.rsdiffbeforeafterboth--- a/crates/evm-coder/tests/solidity_generation.rs
+++ b/crates/evm-coder/tests/solidity_generation.rs
@@ -15,19 +15,20 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use evm_coder::{abi::AbiType, execution::Result, generate_stubgen, solidity_interface, types::*};
+use primitive_types::U256;
pub struct ERC20;
#[solidity_interface(name = ERC20)]
impl ERC20 {
- fn decimals(&self) -> Result<uint8> {
+ fn decimals(&self) -> Result<u8> {
unreachable!()
}
/// Get balance of specified owner
- fn balance_of(&self, _owner: address) -> Result<uint256> {
+ fn balance_of(&self, _owner: address) -> Result<U256> {
unreachable!()
}
- fn transfer(&mut self, _caller: caller, _to: address, _value: uint256) -> Result<bool> {
+ fn transfer(&mut self, _caller: caller, _to: address, _value: U256) -> Result<bool> {
unreachable!()
}
fn transfer_from(
@@ -35,14 +36,14 @@
_caller: caller,
_from: address,
_to: address,
- _value: uint256,
+ _value: U256,
) -> Result<bool> {
unreachable!()
}
- fn approve(&mut self, _caller: caller, _spender: address, _value: uint256) -> Result<bool> {
+ fn approve(&mut self, _caller: caller, _spender: address, _value: U256) -> Result<bool> {
unreachable!()
}
- fn allowance(&self, _owner: address, _spender: address) -> Result<uint256> {
+ fn allowance(&self, _owner: address, _spender: address) -> Result<U256> {
unreachable!()
}
}