From b125f72774abc33eba77d83d18c46ec775ba8164 Mon Sep 17 00:00:00 2001 From: Gav Date: Sun, 4 Feb 2018 16:01:14 +0100 Subject: [PATCH] Rename con:aut to be in line with :code. --- substrate/state_machine/src/lib.rs | 14 +++++++------- .../polkadot/src/runtime/consensus.rs | 2 +- .../polkadot/src/runtime/genesismap.rs | 6 +++--- .../polkadot/src/runtime/session.rs | 6 +++--- .../release/runtime_polkadot.compact.wasm | Bin 69566 -> 69666 bytes .../release/runtime_polkadot.wasm | Bin 69616 -> 69716 bytes 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/substrate/state_machine/src/lib.rs b/substrate/state_machine/src/lib.rs index f5db302063..dcb8a3b4c8 100644 --- a/substrate/state_machine/src/lib.rs +++ b/substrate/state_machine/src/lib.rs @@ -152,10 +152,10 @@ pub trait Externalities { /// Get the current set of authorities from storage. fn authorities(&self) -> Result, ExternalitiesError> { - (0..self.storage(b":aut:len")?.into_iter() + (0..self.storage(b":auth:len")?.into_iter() .rev() .fold(0, |acc, &i| (acc << 8) + (i as u32))) - .map(|i| self.storage(&to_keyed_vec(i, b":aut:".to_vec()))) + .map(|i| self.storage(&to_keyed_vec(i, b":auth:".to_vec()))) .collect() } @@ -260,17 +260,17 @@ mod tests { assert_eq!(ext.authorities(), Ok(vec![])); - ext.set_storage(b"con:aut:len".to_vec(), vec![0u8; 4]); + ext.set_storage(b":auth:len".to_vec(), vec![0u8; 4]); assert_eq!(ext.authorities(), Ok(vec![])); - ext.set_storage(b"con:aut:len".to_vec(), vec![1u8, 0, 0, 0]); + ext.set_storage(b":auth:len".to_vec(), vec![1u8, 0, 0, 0]); assert_eq!(ext.authorities(), Ok(vec![&[][..]])); - ext.set_storage(b"con:aut:\0\0\0\0".to_vec(), b"first".to_vec()); + ext.set_storage(b":auth:\0\0\0\0".to_vec(), b"first".to_vec()); assert_eq!(ext.authorities(), Ok(vec![&b"first"[..]])); - ext.set_storage(b"con:aut:len".to_vec(), vec![2u8, 0, 0, 0]); - ext.set_storage(b"con:aut:\x01\0\0\0".to_vec(), b"second".to_vec()); + ext.set_storage(b":auth:len".to_vec(), vec![2u8, 0, 0, 0]); + ext.set_storage(b":auth:\x01\0\0\0".to_vec(), b"second".to_vec()); assert_eq!(ext.authorities(), Ok(vec![&b"first"[..], &b"second"[..]])); } diff --git a/substrate/wasm-runtime/polkadot/src/runtime/consensus.rs b/substrate/wasm-runtime/polkadot/src/runtime/consensus.rs index abaa24b240..83e59d0684 100644 --- a/substrate/wasm-runtime/polkadot/src/runtime/consensus.rs +++ b/substrate/wasm-runtime/polkadot/src/runtime/consensus.rs @@ -23,7 +23,7 @@ use primitives::SessionKey; struct AuthorityStorageVec {} impl StorageVec for AuthorityStorageVec { type Item = SessionKey; - const PREFIX: &'static[u8] = b"con:aut:"; + const PREFIX: &'static[u8] = b":auth:"; } /// Get the current set of authorities. These are the session keys. diff --git a/substrate/wasm-runtime/polkadot/src/runtime/genesismap.rs b/substrate/wasm-runtime/polkadot/src/runtime/genesismap.rs index 20448eb093..a56d03bd04 100644 --- a/substrate/wasm-runtime/polkadot/src/runtime/genesismap.rs +++ b/substrate/wasm-runtime/polkadot/src/runtime/genesismap.rs @@ -66,18 +66,18 @@ impl GenesisConfig { .map(|(i, account)| ((i as u32).to_keyed_vec(b"ses:val:"), vec![].join(account))) ).chain(self.authorities.iter() .enumerate() - .map(|(i, account)| ((i as u32).to_keyed_vec(b"con:aut:"), vec![].join(account))) + .map(|(i, account)| ((i as u32).to_keyed_vec(b":auth:"), vec![].join(account))) ).chain(self.balances.iter() .map(|&(account, balance)| (account.to_keyed_vec(b"sta:bal:"), vec![].join(&balance))) ) .map(|(k, v)| (twox_128(&k[..])[..].to_vec(), v.to_vec())) .chain(vec![ (b":code"[..].into(), wasm_runtime), - (b"con:aut:len"[..].into(), vec![].join(&(self.authorities.len() as u32))), + (b":auth:len"[..].into(), vec![].join(&(self.authorities.len() as u32))), ].into_iter()) .chain(self.authorities.iter() .enumerate() - .map(|(i, account)| ((i as u32).to_keyed_vec(b"con:aut:"), vec![].join(account))) + .map(|(i, account)| ((i as u32).to_keyed_vec(b":auth:"), vec![].join(account))) ) .collect() } diff --git a/substrate/wasm-runtime/polkadot/src/runtime/session.rs b/substrate/wasm-runtime/polkadot/src/runtime/session.rs index 2c195dbb72..5ebc444f8f 100644 --- a/substrate/wasm-runtime/polkadot/src/runtime/session.rs +++ b/substrate/wasm-runtime/polkadot/src/runtime/session.rs @@ -151,9 +151,9 @@ mod tests { twox_128(&0u32.to_keyed_vec(ValidatorStorageVec::PREFIX)).to_vec() => vec![10; 32], twox_128(&1u32.to_keyed_vec(ValidatorStorageVec::PREFIX)).to_vec() => vec![20; 32], // initial session keys (11, 21, ...) - b"con:aut:len".to_vec() => vec![].join(&2u32), - 0u32.to_keyed_vec(b"con:aut:") => vec![11; 32], - 1u32.to_keyed_vec(b"con:aut:") => vec![21; 32] + b":auth:len".to_vec() => vec![].join(&2u32), + 0u32.to_keyed_vec(b":auth:") => vec![11; 32], + 1u32.to_keyed_vec(b":auth:") => vec![21; 32] ], } } diff --git a/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm b/substrate/wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm index 2ea4d55786392d88789f4558c8f01f70334b5754..e422068474f03a8d8b572bc08de121267e5ad904 100644 GIT binary patch delta 3685 zcmd5;eNa@_6@T}>x4`aW;UUXM)m`2$Aj_A4##I(WctI3IMhu#1^A9d$qu{#WE?6BM zcPF83jJCmE^u>Gx277``tx-UX#PFsK zcB`1b(3V%X%Jjuw+1e9I7;i-hqgE+NSgG7+hm(+Qnh|x=5`(fl{cR&2u#+zq_E8bG zeh-8q*a|U~Rbo*pzHcR4%4YDmjd;peQ1OHE1NerGI4f3A(N^&ozG_njDvl$dD$AE% zrjmT}*nX<+UUu3noRTWs2-T#rb|VLamCDPtC%D{? zld&y?_RTs>G20wD)FX#_sQFYYS5N#68Ryj3Po>YMN+LgeB@XeN#&JZ_`Re<6Nl4?+ zzsW@OYecEvg#Jjbow1`C@`p3epc%#Wnu`Nv`}ulWge&K(5Q>t|-tf|}YVoQ`>+sLN zqAgHX{ivVirb>h-l-nZ(h!zuF+>7d!eHSwk9RJ#%H8Kpaptuw^9sg7=N z^QJ63X(b(-itr_ya%9t4BX=BQmejObLLw`L)|nYxgKI>#&di9cU~m}Bh+%jM*$upy zAhIrO0by`qK}?Vs7tRJDbV`)#0wBSOvmFMJ?WBl-szRrT0nC~YM6pv!>U3b8<-!cu zz`)XYjM%EW3l303EtG}!TpoEei7m;;hM&e*TRvkJF5(o1!+I&o>h+GUqCk2`V z7R-nY%p$U+x(%pf3xz`EiOnX&UHm`EJM=&0P3s)Xo7Op&H`E=KF-#RCZ;&vQ0sfUT zjQhV9LoJJ#P{=Y4($JQr*TvKJ3c^vF@~Hg;LXRthURxqst6cXDV$`U7y{iSypSB5w z&<+O|P$9VKFh?7bce@MJE2MiP9?BuBc5FdaWO&EhXf5#v!pKb?1VkD;E%+%yjYJAs zlRHr}%+_@!h&xvdXK|ouk$PE1 z)_;bm*YTDH@~;hv?3&~R^7>O7=xL{>p{Jh4ceG($%hPap!P?AL3TsHTr3FWeL2V-6 z-zcKPMA_KP4cLW3a%|5<4k~j}S-*D=<^~-w+s%EqS#@4={`u?lpz0T*?}alcbJRgA zC<@YTZLK<%|1ANdNyYV@bO-|12Wi^>TWzrDrK{Woge4aaw3E66UR6;p9C(#Qr- zMS1S!L6ox`BF@m`AW^O;IB^)+Q>ff!N5TqXKeQQAQ(idqJ`1;}=g2Yyx2JrxW%UZ7 zSv1y}Gek~clQVd!PhFohqzO^PLJ{oytaR%7P_Eh;qnen=CFOFdW!eD;F;yr4exC+} zOUMrSQOZ{rr|caNXv2N?n8~1g`!{4>XwWGpi6+%i9U^r&>=aF+HXNk{ZFtZrT6C^D zj1gwJcbsC@oSSYHE%r=af{2-Okj@fQ$iUsybeO`TV`EM=xnbp}cW)U`m2&W-BP`os z=g74OmGtIseW1P+rXMt+)#S;jGp&-RccK(w;DmCiyfjGmM6KX~iKo7jHtp}C-vDa) zL+jEtl#1r4BgJ&CH+VEJ_V$gSZH{yZM6YIC1A7;KSO=T+-oy5|w?p}-Ygu%I?D>4Y z_Ch=Mc{Re}Qu6!1+j9p>)b)>O;+`s4xYzl!6=&f)gyXr0V*Q6=PDpTjdV98Bxy_+` zw6@3N{$_{I%}DQ9`NSY-!EP@jjp>Rv;9;Z*UGaI_8EMkW3*D)V`lAxlk#yh6*OQ8W z)`uABl8qOd0Z0S;Phft7N*K5CX}*rO_O5`pEZ`0H`g#@zf{YZk@z@P__q2`At`Qh! zA&{fsYy;T<5BNj$gE@S*0B9a4vuH~U9Rf50K2ES$X5sc29LbT7B%%@=%{j`WT=~z5 zs1Qd)IV}l^p-EB8*&l?Q@8}AA$3a56veN^~w8*nQFMRFIhAz zy*R7*z@cAPI{eQv(tsV-2dgips|QI7vmRc!8B98iq!FF#_rU}aJ9%rS3`gzc!AwS| z&%tL;0jUUh5s<+s9U4B^15ODi}vp9}B5aW&l+6`z9Sjy*VvIoXm zeJ5xn*!ng#(j;(efSVtRBR>yg4jw3mgBJvV9iUXgN^(_eUoIpGfz>2I&Lv5G26OcZ z)Vd7;w;wnK0L?DO3uA3DqkuL8>SC78!CPbS1i(>Wq5ksT$Y9n%SBYAv|?BP(R z>^CDGjmxKvs0#Pz%O4m~F^=SGMb4*1#{G-r_ma^f99bmqHK9Tjm0vTVJltO(kD1UC z94Uadad1-we35+9gtFyo9$7*MoxBjXXvv?2+2I9D(~PrT07JQI9R_O@xL+;UXq?p@ zE901x&mI9TJqP0;;g9(R^om)HbZ0g`bUSkhoUE!jTqt{zQ2`o}_a`Ge9xo(gkFp_; zcfnY6xQI8n+q<5H1|KYfjm>~v1FtYh+6?F5Nl>FiF$FAxrCq z@l3r;5Ju~^0YEncS_qa|v^Iv009pwO@{PZAF-%wR3x25$UM`KiAmRybTpw2acE0BW?ZMHLrl`HRwp{ONzZ+6S@Dnl zS%$~C=lp*6ymQYv_wZg1@*f`K2mXN5F*X|F41}Z*VuBxITwIdTK>vm}tXr1qZSht& z2fS5*CXdhWsSeaO_)uBO&uV?1`dYuYYFm9nbsbus)YR;&3V8hiKU$F_Vk9HMu)$`Q z=FGBWEqcUo@Jp_&M{OrHn7`-{OVodGZzf`9*nx?rE{Ic$Q_m-nPAC0tRtFOu=2t+d zX_jolMB^o#IgKzy1T$if>yPs;0Ok~TKt1| zn54IU_!3i}UHG~Y_fV-UBVouPcgz$^>C&=IECi+OC{L45JVl1gboYsR{3#tjv7U^Y zY0=4JO#JoaZgQK6e7g5kGh=;sssgX1>v|WGVKcqgyNH(b3iNlq1&nsDw5+9AX1&Y8thb@gc%=DTx6S>4q)S3BA9U;hiUJAtr%kh>1e z^uk-4$%ww3duB6fcY?K&TPwQhXJ>I)7irbiR;itQ~eD>1!$8NkltOx9po<615N~K{78ENc+{Ta+5>lCWmV0C7g#)F~rNu z1R{q&^AK|X&-e`p33v6_>5;wVs(s%YOh&A#Z~sw@m#W5>EeW_>bsg*>c$IqT&_+CC z)GB5pK|U~(32`wjzt$|`Vp`bkV3n-u-o$rEP}!fCr_ztRAH_?k`L*-7oL+sc9WSO^ z4@>L~dk){i;Ip}>k7ug&_&1o|=pW$0m!u4JkD z!Mmq$+HD&PK@#OLy=66|ZuC@*t!~g-DUNb8BY?Oq#fH*m~63OaSaW8v=zEr{nJOEb9h`mdubuYAs)5~I+m6`yOfkKU>Ho`fCRkQt`c>uqr07uG)xrw^|$2f!WaP|4Az@R$V{M!0Z*vw_Ibw z@x*&2&YwAZS{IM zm_6#%nwF%A7}TvzD@jc04`g8;!YrYGX}%h>p5K|Mr9hi~m!CFADR)}FViY!j)h~DT zYZPr7AK!gSy>XdNZR>VQiIPDpnzqE+vd<|QBz-x^2>PC%;D(*jvPvA;{n{;{g<9Nh$RH7p7ErMOqZQ=+qjkPqqC0vpBp&jePY>j$3KtsX0=_vUlO1 zT4EoIRNx}o8*xrqE66b5>#xCL=nCHqv>?R&1D;k>|CW0ky2<- zei<8r32SFQD{*_4p+}8KbTc3LfsbG=3*rp{Pi>nR;2~URPt_(kDJ7+Fp|0Ot0X>v+ zt2$PKL$}s&c#vMZGehr{@9&gg5^>R`-`cV}UD~mNx){?02lGpKqu@0B6XykfV48@K zEGl9=PFIh9+igrttZwkRJ?0CpD|<+#1YuS zewZX|A&**wRdngUSG6Iz$0~>eQJ-(aIpQ?JfK`}MU%Rckp~;)qq`a7b zUHph7SQOcW)0Hbc7H~xQa{|t83)+NPm7XTAFCf);{56ulrlGlhyR^+KK|*V{&qpxy zgv_o~gmS=RBS;q7tMEh*ZW9vyyZmk+)C2Mg+*07opTzBsac=`E0cr(H7*Yq38gaC%mfEZj8gYN?z1b+pS(ApRpRB{ctkPpumta?(PG2mp}uE0k_F$rZU zLk65nB3WAR;Gkj?a0Us@QF4rUE{V)hJOa)J^L_zmkRfBXb`rP?wUJjPu&g zIUvCSk9(Wm-wuJ(di!G3{B$jA`w<7UJ&@o#7|CN%#oy>fayY7Zn>#xyZDH{9WW!Fkr?CmrA5|Kg z8X*1PrhS^;o1u(o#=wo_ro3Squ#VDgg?gfH8Ds3>^eC0v_SQmd9W= zOmx>HE+J75sS!>y2IO`i!^d@uTM^?%Tmps>+^%2~UJMy7F<}RZ%u}8;;rYw+rlJ;VBbG<<9F`4=l<@w_r35@VR}>uUPEaKW|IjENdiuWA3|o6!E7+ln`mFHoZ{{CHud_w zJN-SLPM@dA-`ds5txx((W* z$C8=7q002q9scPfYACS{339x&MlDEMVNk0Qe#|50Z9&Fa67fGy!oxONU>RUy-0~_2 zb-gtYGr5~Mlkq(ZeWPd=PgyA~Ud6;G#Ru^vD}AP96%&U`zKhRW)ypMsAqZ7lSDs^% zlG2xTk*0=9e_=+W^m~=*2@i=putYXW>u7uBb^(+%>W7s_gsiU;u{D5xBEvEqSdeG9 zc6+7^3nWv95fc_Db)99*U$&QelrH4zritqbmZ8Vb8#<>{g)c= ze}~?x-huv3?;f|IS!#a!88oZ5yzLUeIQmXCTlYWTDMu(wvrlfxwHYtn1xrC z&FwASG5OaRr2Lb3jTL=0YRy$kG_d{JT^6YCjQYc=-)e!8jY|3KI4$2%wd9_~g);~z zV;4>(94PT^F6;n#!$NyY)sJ?ZNC>=zF(0#)#qD+@>?E!ryd0=CbGU-3Rc4Ox zlEH2;BaRbgWHX4wNO+doNDMA45u?np`HZsECbQV505CdmhTTATm^gzNm?^ap4B(>0 z5J=jfBzpiy!d#dGCwO?45Ogix4m#2GRJ-89%RmPqfQUr#4$R2{%*PX^+6}S*^Ktro zTpK|yj$@ND3<}nnV5NgbjCr)Laj`+3Tq-%$J-bXOF#i8Q2cthq2cthq2W$r_;<$3) z#2{l}2mTduoO_NV^AjY|?nZmOMh+*=(ypCL>8ra+)PFSAARM-;Ma@SLTB~05TI0}W zI@q16qTL5Ds#RaOCnibLP3P5Zzh58~5Aj)#?uPDJ|c$6%X3zp-o4bD6H9! zgG?0D&ue;F)V9rA;JhB)T#66aXl?B(npC@*h1AxTEgH7ToRlb%bUDmv2RL%h-mEP^ z!pVF%z?Zk=XqW1Pt^Y!7)U}39w75QwuTC`5FY33kD?)b(^z-_9d~@F1-%t-HAJ979 zEmc$d_68iz2XhO(xSgQG^w#z|Vb~@)>6QKC0x)w_{ps`ju`ptnD#ioXd2M=n|5;al@XC2%8nV)vgH3eb zL9b@0GY60HXjC2eWe{bqf^4(wl*lZONDkbOY)MS^*^pF58-{kl%G7g1U-EG4($`86 z+`1pX-msxe+C~zp%xOfB_{20(9?)u&$8*;{RQ-x@@>+S#i?h8CDv~rykRn^=Rczh10xO+PfXfCO+}h|%0Wy-S0`A2 zt{!rb)JUwRMg!(zZ#u}L`C$<+NwuYmGGt7jhayoViC(^yoB~s%MzBeTwzyO3y<49e z&}#J$cVFZA8k<1xeqF}i7(-ucFO!_`7POK2!;S@RkzJK?h=UU{>AlNy_u7$SrRm#B$&^tcvnOV19PwE z5NfxlXqP&>&0$x^?^nS#&faf|dEYcXsNvBiditBi`YZCvH)|2@FQnolTh?%awz8lu zZfk;v7lC-9Dw?0zMMx)!)>u-7AWI)-d+V64iYwd7z@gw?p^>}@~9scD#K28o>MeGKq9$LkW3W?*ELU0%cTS0Du2gXC{Lz!ZR1n4p_=Fo;H zItFM6#yB)|p+2}N3WqY4kK#}P4reMu0o4R9E;m&6QijiOerUH~{(PRPNS^j+o+&LshVs~q#6TFbJlnO`?dk4;6BIGJd%EBN z6+j~_(i>qaJwg;D(Hm_T&|QG$foBe_jG{q6ivfi%rYO20ie3Vg0~Aiq#wg5g8$I<* zff%os)D3I7&B}o3pNdJfB^ujbC?dF62bF6{Xfe+(Z9Yny1Te;^!5_%N5)KIv zdlJv!A+$B!hI1$hN(0zQ3RdT!n89h>3C);+f+_CQ(;-taLlfH2Mi5GvlC*t$`oPSz z|5c;Y+kL;^zJ2@N+ou}~@{uEa=nBrn*l5rh2uUTx1RtYLmuxi9oA`wl^V2;$JqcHeu=|O+k}ax`&TOIcG6OF7ZblU{}6<_ z$TFQUxm_wUkueK>v*ZC8v{I#XHWOD%Un3za-B>o8iL0fV^hBAJ1g+}jvNti%)oo9n zW|9t+XVQxD084|q*@D)1sXbl-N)8?Z`m`FLci`-+Pl%74dgRx4Fuf&V#%g4*fB{OyP&8EKN z0)242jL}?u6`9>m8Hp)^lqE+{6WeacEXwMxzGBSxy2N?v`~8L5aj(7iC1z_vCzl%Z zVoFMqAXcVKqC+QEkp~W@rDsm8Bcsvb_fD=Oolel!ax272$_=a`VHZqS(qjV>?xG(L z)biKOVi9fMy_f~#!`)NJc?%uiT|^FBRen!ja?-1W@E!PNdS!2xiCbty(j-|wi)2WX zB#z$OE2VNx5}A(BQwR`HZQ7TW10mCBO?Dzh$I>Jx5$!zv(Y~Cjn1(nBl6mndiAZc{ z=ViW$t>YONHA#3DSmdG@VE~f#uoZoKuN@r z1pj!MfT!>?10nbS^w)rp@F3yqVs-7lWtfaw)!=JyVO*`w{edM3FQK?MLv8y>H^EEQ zhX>c-sbf~L2nq83TqeXhFubj4#5r_puY+alK<`@8CDG4%pT||S=8a#2k+egdc|iTC zk?0_4@iOk=o9z%oo>WWNh-BFM)S#r-ed1TdR(Sb`gHe21Qq+ zj&oZ1QP-JsNl=tSpgL-hdn!`QnA3h3U>oTzQfF)jLJV|ttPHanMa;FW8%jxmoY=W{@ z^&fx2;alpb7s@fdMWHyw{S(^d#FG&gw|L0{obaLH-f9Ww;JC6Ne*J`HheibH>V!Hh+TVA)um4i_+t_cnr znec8|AN-5+0v}ROf2A7r`i54oyM9ODj8}&X@CJ|H-Cp0~M)G;HkmQG1i^q%POYuod z1CqyLlSc0rBwsfR*~o;D3n5erG7V%6Mko^`lJCW+-WD*@X;BX7a7kInBBZr6Zf08{MX7DE>PARaUqEmC{)1H zaZvd{!1?@ep)gaKlY+CAZv>ppM+zTHOON7C!6h9-4hVRl-n}_m)DD5u3VI}_exZ@o z`lthH9Z2xXi{$ax#P9PUIUJjK+Uk*fD^BwOEfP1ZW%5A`^7>&>r!#7lQf8 z{vsi}6s~gx81R8)W!MkTB+Xz*`MD8Skw}r2Sa*+0ND4G=V?6}U=z`co3-Rs@K#+s3 zM|Or|cA67*hLz7@`woxaAMXcYF!g+EySv`k2BD8ld~K}|da%?vC0eJ$S+Qt=rD)}M z7Yo_7fWliXilg%rXb?~dPOp`bV3OV5_+r*QqNYcS1%1>d9~@{LxSha- zcjp9mWr7