git.delta.rocks / unique-network / refs/commits / 767e0d8c51b6

difftreelog

fix merge artefacts

Igor Kozyrev2021-12-02parent: #ba996c4.patch.diff
in: master

2 files changed

modifiedruntime/src/lib.rsdiffbeforeafterboth
1019 ($collection:ident.$method:ident($($name:ident),*)) => {{1019 ($collection:ident.$method:ident($($name:ident),*)) => {{
1020 use pallet_unique::dispatch::Dispatched;1020 use pallet_unique::dispatch::Dispatched;
10211021
1022 let collection = Dispatched::dispatch(<pallet_common::CollectionHandle<Runtime>>::new($collection).unwrap_or_default());1022 let collection = Dispatched::dispatch(<pallet_common::CollectionHandle<Runtime>>::new($collection).unwrap());
1023 let dispatch = collection.as_dyn();1023 let dispatch = collection.as_dyn();
10241024
1025 dispatch.$method($($name),*)1025 dispatch.$method($($name),*)
modifiedtests/src/eth/payable.test.tsdiffbeforeafterboth
54 expect(await contract.methods.getUnaccounted().call()).to.be.equal('10000');54 expect(await contract.methods.getUnaccounted().call()).to.be.equal('10000');
55 });55 });
5656
57 itWeb3.only('Balance can be retrieved from evm contract', async({api, web3}) => {57 itWeb3('Balance can be retrieved from evm contract', async({api, web3}) => {
58 const FEE_BALANCE = 10n ** 18n;58 const FEE_BALANCE = 10n ** 18n;
59 const CONTRACT_BALANCE = 10n ** 14n;59 const CONTRACT_BALANCE = 10n ** 14n;
6060