git.delta.rocks / unique-network / refs/commits / ad8f1f0bd0a0

difftreelog

CORE-302 Fix tests after rebase

Trubnikov Sergey2022-05-23parent: #3db1f04.patch.diff
in: master

7 files changed

modifiedMakefilediffbeforeafterboth
24TESTS_API=./tests/src/eth/api/24TESTS_API=./tests/src/eth/api/
2525
26.PHONY: regenerate_solidity26.PHONY: regenerate_solidity
27regenerate_solidity: UniqueFungible.sol UniqueNFT.sol ContractHelpers.sol Collection.sol27regenerate_solidity: UniqueFungible.sol UniqueNFT.sol ContractHelpers.sol Collection.sol CollectionHelper.sol
2828
29UniqueFungible.sol:29UniqueFungible.sol:
30 PACKAGE=pallet-fungible NAME=erc::gen_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh30 PACKAGE=pallet-fungible NAME=erc::gen_iface OUTPUT=$(TESTS_API)/$@ ./.maintain/scripts/generate_sol.sh
modifiedpallets/evm-coder-substrate/src/lib.rsdiffbeforeafterboth
5252
53 use frame_system::ensure_signed;53 use frame_system::ensure_signed;
54 pub use frame_support::dispatch::DispatchResult;54 pub use frame_support::dispatch::DispatchResult;
55 use sp_std::{cell::RefCell, vec::Vec, rc::Rc};
56 use sp_core::{H160};
57 use frame_support::{pallet_prelude::*, traits::PalletInfo};
58 use frame_system::pallet_prelude::*;55 use frame_system::pallet_prelude::*;
5956
60 /// DispatchError is opaque, but we need to somehow extract correct error in case of OutOfGas failure57 /// DispatchError is opaque, but we need to somehow extract correct error in case of OutOfGas failure
modifiedpallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth
28};28};
29use frame_support::traits::Get;29use frame_support::traits::Get;
30use up_sponsorship::SponsorshipHandler;30use up_sponsorship::SponsorshipHandler;
31use sp_std::{vec::Vec, rc::Rc};31use sp_std::vec::Vec;
3232
33struct ContractHelpers<T: Config>(SubstrateRecorder<T>);33struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
34impl<T: Config> WithRecorder<T> for ContractHelpers<T> {34impl<T: Config> WithRecorder<T> for ContractHelpers<T> {
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
33use pallet_evm_coder_substrate::WithRecorder;33use pallet_evm_coder_substrate::WithRecorder;
34use sp_core::H160;34use sp_core::H160;
35use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};35use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
36use sp_std::{collections::btree_map::BTreeMap, rc::Rc};36use sp_std::{collections::btree_map::BTreeMap};
3737
38pub use pallet::*;38pub use pallet::*;
3939
modifiedprimitives/rpc/src/lib.rsdiffbeforeafterboth
23use sp_std::vec::Vec;23use sp_std::vec::Vec;
24use codec::Decode;24use codec::Decode;
25use sp_runtime::DispatchError;25use sp_runtime::DispatchError;
26use sp_core::H160;
2726
28type Result<T> = core::result::Result<T, DispatchError>;27type Result<T> = core::result::Result<T, DispatchError>;
2928
modifiedtests/package.jsondiffbeforeafterboth
89 "bignumber.js": "^9.0.2",89 "bignumber.js": "^9.0.2",
90 "chai-as-promised": "^7.1.1",90 "chai-as-promised": "^7.1.1",
91 "find-process": "^1.4.7",91 "find-process": "^1.4.7",
92 "solc": "^0.8.13",92 "solc": "0.8.13",
93 "web3": "^1.7.3"93 "web3": "^1.7.3"
94 },94 },
95 "standard": {95 "standard": {
modifiedtests/yarn.lockdiffbeforeafterboth

no changes