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

difftreelog

Merge branch 'develop' into tests/increase_timeout

Max Andreev2022-11-02parents: #ec33a1f #1e082e3.patch.diff
in: master

3 files changed

modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -23,10 +23,7 @@
 use crate::Pallet;
 
 use pallet_common::{
-	CollectionById,
-	dispatch::CollectionDispatch,
-	erc::{static_property::key, CollectionHelpersEvents},
-	Pallet as PalletCommon,
+	CollectionById, dispatch::CollectionDispatch, erc::static_property::key, Pallet as PalletCommon,
 };
 use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
 use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
modifiedruntime/common/config/pallets/scheduler.rsdiffbeforeafterboth
25use codec::Decode;25use codec::Decode;
26use crate::{26use crate::{
27 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},27 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
28 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller,28 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller, Balances,
29};29};
30use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;30use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;
31use up_common::types::AccountId;31use up_common::types::AccountId;
modifiedruntime/common/scheduler.rsdiffbeforeafterboth
--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -14,16 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo};
+use frame_support::{
+	traits::NamedReservableCurrency,
+	dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},
+};
 use sp_runtime::{
 	traits::{Dispatchable, Applyable, Member},
 	generic::Era,
 	transaction_validity::TransactionValidityError,
-	DispatchErrorWithPostInfo,
+	DispatchErrorWithPostInfo, DispatchError,
 };
 use codec::Encode;
-use crate::{Runtime, RuntimeCall, RuntimeOrigin};
-use up_common::types::AccountId;
+use crate::{Runtime, RuntimeCall, RuntimeOrigin, Balances};
+use up_common::types::{AccountId, Balance};
 use fp_self_contained::SelfContainedCall;
 use pallet_unique_scheduler::DispatchCall;
 use pallet_transaction_payment::ChargeTransactionPayment;