pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-13 22:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate smrl-treasury and srml-upgrade-key to the 2018 edition (#1725)

Browse Source
This commit is contained in:
Stanislav Tkach
2019-02-09 19:06:20 +02:00
committed by Gav Wood
parent 810c391de2
commit ca69ad4c30
37 changed files with 88 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/contract/src/lib.rs
+8 -13
View File
@@ -52,14 +52,6 @@
#![cfg_attr(not(feature = "std"), no_std)]
// We need these `extern crate` to be placed here otherwise there will be errors.
// TODO: https://github.com/paritytech/substrate/issues/1509
#[macro_use]
extern crate parity_codec_derive;
extern crate parity_codec as codec;
#[macro_use]
extern crate srml_support as runtime_support;
#[macro_use]
mod gas;
@@ -73,13 +65,16 @@ mod tests;
use crate::exec::ExecutionContext;
use crate::account_db::AccountDb;
#[cfg(feature = "std")]
use serde_derive::{Serialize, Deserialize};
use rstd::prelude::*;
use rstd::marker::PhantomData;
use codec::Codec;
use parity_codec::Codec;
use parity_codec_derive::{Encode, Decode};
use runtime_primitives::traits::{Hash, As, SimpleArithmetic,Bounded, StaticLookup};
use runtime_support::dispatch::{Result, Dispatchable};
use runtime_support::{Parameter, StorageMap, StorageValue, StorageDoubleMap};
use runtime_support::traits::OnFreeBalanceZero;
use srml_support::dispatch::{Result, Dispatchable};
use srml_support::{Parameter, StorageMap, StorageValue, StorageDoubleMap, decl_module, decl_event, decl_storage};
use srml_support::traits::OnFreeBalanceZero;
use system::{ensure_signed, RawOrigin};
use runtime_io::{blake2_256, twox_128};
use timestamp;
@@ -144,7 +139,7 @@ where
pub struct DefaultDispatchFeeComputor<T: Trait>(PhantomData<T>);
impl<T: Trait> ComputeDispatchFee<T::Call, T::Balance> for DefaultDispatchFeeComputor<T> {
fn compute_dispatch_fee(call: &T::Call) -> T::Balance {
let encoded_len = codec::Encode::encode(&call).len();
let encoded_len = parity_codec::Encode::encode(&call).len();
let base_fee = <balances::Module<T>>::transaction_base_fee();
let byte_fee = <balances::Module<T>>::transaction_byte_fee();
base_fee + byte_fee * <T::Balance as As<u64>>::sa(encoded_len as u64)