From 72a8927ea310000790832fc660068f5333a240ba Mon Sep 17 00:00:00 2001 From: thiolliere Date: Tue, 26 Feb 2019 09:26:11 +0100 Subject: [PATCH] replace some encode by using_encoded (#1863) * replace some encode by using_encoded * update runtime * improve readibility --- substrate/node/runtime/src/lib.rs | 2 +- .../release/node_runtime.compact.wasm | Bin 822310 -> 822150 bytes substrate/srml/contract/src/lib.rs | 4 ++-- substrate/srml/support/src/double_map.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/substrate/node/runtime/src/lib.rs b/substrate/node/runtime/src/lib.rs index 9ea9f86998..56ac26b4e8 100644 --- a/substrate/node/runtime/src/lib.rs +++ b/substrate/node/runtime/src/lib.rs @@ -61,7 +61,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("substrate-node"), authoring_version: 10, spec_version: 30, - impl_version: 31, + impl_version: 32, apis: RUNTIME_API_VERSIONS, }; diff --git a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm index bde6c26372b474f4eefbcd706690a4e2d9b239f5..01b649f54664e128570ed745c5d8828cac2440a4 100644 GIT binary patch delta 1788 zcmah}U2GIp6u$S)%+BoGj@(Tt{aGrvLzCUc1RG4YQd7dT*_4)~eK0=ofY5*h*JxE5 zAB?n7qx(XP4~DCj#A=8p7SPb(6^#TzBT=$qOeK?)&m z1x_YFEodFc$aiv{%J#ZnPL&C9}cK zqb&xcfRL;n6pVS?X7xb~yrBk949$}izDtbHlM~nz4=;ph;0CFY?=O%wID3APz-!3! zi{`o`B>S`c^;Ije3Kz1mF-ykABFjHvp2Y`jcpZ475+87L8_0|$z8iOI#r(KiH^R-J z*tMDVFgH0ab#1Dyak*<#b&bnin{Wi|XcmkBr3f(4iQ5d$Ns^!@iyP|T_&7xnoE0l< z2ic+?ZX`*wAK|+}CVl%cj{7|zh2xA*xZUGfJQCm`-{Axvrzh?^0otmxs!F)Sd4xMK zE0Xp|RfLABrtstdd&Dy-cLL1TA{scN^_W}J=%h%qDkueaohG;fc``6&%nlh1;>=aD zW;Jl3W(ZZP5vuudOB_7r##@{;ROhJSh4XSMhiAg@!hzRid{bP6Tn|{CsLg
    jor zzKVf?6ClzDrd25Aqj+>nK;`4d-I|foFm%2m`K9C`^Xl3PhD}oC7BO%OBq2^%z2blc ztw0k7nz%};R+_=wk{M`rWu>tiwu)O?@t7LC+6=8Q<(J3ZlXv>E#0fWdhmQ|j_R0AP z_l=cUDoe#zYO3>GUXDq(KUdu~_{7lD1G|TK*WjKxdm^>1rKOf_0AxIVZoO3#9%72w|!aAdN~Xr@p3L z828GC3v?X;*`A|26@K$u8ploDPcdYJeTM^C=Tvgp8#B2fwf-ycgwyX=zS{v3zz7F*y>efi?%d2Ra={Q~#sJi7e<(=iHdZLg?H+r#{zU!hIxU8afXidi07 zrrl7k$p1!f1KF?$(-w^5qXIn#@Y%mW05_X&(tGfGA_Kyj7-Yy5x$Cqxc4m$t4AJ%P zGjUcqUJ%!B(!_|aSxepeJaDoDu4uiM6QGCxaioiT9`FXhy7oT6trholZ&OfEALyIG b-U!m%&(KGb~nS4lHzCqfsQax1|Q>?MIK3rRz!_ zagwF@=E%ikj=Fd(cIS6oH*#v2!tKHxSEq)(*%XiI{K$JmgbB;G*5N zJ`K<=9qmfMlp2W;u4tw(egYkrP!`4NqbCYOAPI-TU@_l>7#uBcg*-CpmG7i!(x4kl z0|>2m85FSLlrX^etr|04Kh}XV7BsDm03x(TpnEM5P-0xfOy}7!NZ73_Yqfd>N7s7;0J8Av=xLjJj-H8K zs0TXKU@+!|Zs1&>GXy=azKD?kG;U$gWswLpu$jDi zZ8nEDb`BmKdbR(B zA<;Rw|HWPXhYs|-q}oQqR-(3_XHSuJk+CmXvlUOh%uyUL2h^`$vwfDyxbiJ4k-e8#gFzg-#2z+?3Rd^q zP_yL+cAHd>0)(w0z*@ytrDs?t#u@e6WmZSPesqQH)BegVtHt%LuW&>mKbhueE7+wz zjuK!^Jf+e`7fdca=Shos4c< z;!(Cy?YYK|(=wCT)RU*ARgxTg0%v4Pj_t-N^?HtN@rt)i&9m=tx2a>=zn_ke;aJZV z^<~zh`Ve2GO@6io~t<++%Hr{|AhHnJ)kU diff --git a/substrate/srml/contract/src/lib.rs b/substrate/srml/contract/src/lib.rs index 9073c9b98d..90cccfce79 100644 --- a/substrate/srml/contract/src/lib.rs +++ b/substrate/srml/contract/src/lib.rs @@ -69,7 +69,7 @@ use crate::account_db::AccountDb; use serde_derive::{Serialize, Deserialize}; use rstd::prelude::*; use rstd::marker::PhantomData; -use parity_codec::Codec; +use parity_codec::{Codec, Encode}; use parity_codec_derive::{Encode, Decode}; use runtime_primitives::traits::{Hash, As, SimpleArithmetic,Bounded, StaticLookup}; use srml_support::dispatch::{Result, Dispatchable}; @@ -140,7 +140,7 @@ where pub struct DefaultDispatchFeeComputor(PhantomData); impl ComputeDispatchFee for DefaultDispatchFeeComputor { fn compute_dispatch_fee(call: &T::Call) -> T::Balance { - let encoded_len = parity_codec::Encode::encode(&call).len(); + let encoded_len = call.using_encoded(|encoded| encoded.len()); let base_fee = >::transaction_base_fee(); let byte_fee = >::transaction_byte_fee(); >::sa(base_fee.as_() + byte_fee.as_() * encoded_len as u64) diff --git a/substrate/srml/support/src/double_map.rs b/substrate/srml/support/src/double_map.rs index e62b6518d6..bd3fd973c2 100644 --- a/substrate/srml/support/src/double_map.rs +++ b/substrate/srml/support/src/double_map.rs @@ -101,7 +101,7 @@ pub trait StorageDoubleMap { { let mut raw_prefix = Vec::new(); raw_prefix.extend(Self::PREFIX); - raw_prefix.extend(Encode::encode(&key)); + key.encode_to(&mut raw_prefix); raw_prefix }