From a5195dfce6365f1dc7ff8c98a47fffcc0fed90e6 Mon Sep 17 00:00:00 2001 From: Gav Date: Wed, 7 Feb 2018 11:47:30 +0100 Subject: [PATCH] Rename polkadot-serializer -> substrate-serializer --- substrate/Cargo.lock | 26 ++++++++-------- substrate/client/Cargo.toml | 2 +- substrate/client/src/lib.rs | 2 +- substrate/executor/Cargo.toml | 14 ++++----- substrate/executor/src/lib.rs | 2 +- substrate/network/Cargo.toml | 2 +- substrate/network/src/lib.rs | 2 +- substrate/primitives/Cargo.toml | 4 +-- substrate/primitives/src/hash.rs | 2 +- substrate/primitives/src/lib.rs | 2 +- substrate/primitives/src/parachain.rs | 2 +- substrate/primitives/src/relay/block.rs | 2 +- substrate/primitives/src/uint.rs | 2 +- substrate/primitives/src/validator.rs | 2 +- substrate/serializer/Cargo.toml | 2 +- substrate/serializer/src/lib.rs | 11 ++++--- substrate/validator/Cargo.toml | 4 +-- substrate/validator/src/lib.rs | 2 +- substrate/wasm-runtime/Cargo.lock | 28 +++++++++--------- .../release/runtime_polkadot.compact.wasm | Bin 69581 -> 69581 bytes .../release/runtime_polkadot.wasm | Bin 69660 -> 69660 bytes 21 files changed, 56 insertions(+), 57 deletions(-) diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 919454982a..41c2d747f5 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -1003,10 +1003,10 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "native-runtime 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "polkadot-serializer 0.1.0", "substrate-codec 0.1.0", "substrate-executor 0.1.0", "substrate-primitives 0.1.0", + "substrate-serializer 0.1.0", "substrate-state-machine 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1033,7 +1033,6 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-client 0.1.0", - "polkadot-serializer 0.1.0", "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1041,6 +1040,7 @@ dependencies = [ "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 0.1.0", + "substrate-serializer 0.1.0", "substrate-state-machine 0.1.0", ] @@ -1082,22 +1082,14 @@ dependencies = [ "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "polkadot-serializer" -version = "0.1.0" -dependencies = [ - "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "polkadot-validator" version = "0.1.0" dependencies = [ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "polkadot-serializer 0.1.0", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 0.1.0", + "substrate-serializer 0.1.0", ] [[package]] @@ -1434,12 +1426,12 @@ dependencies = [ "native-runtime 0.1.0", "parity-wasm 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)", "polkadot-runtime-std 0.1.0", - "polkadot-serializer 0.1.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-codec 0.1.0", "substrate-primitives 0.1.0", + "substrate-serializer 0.1.0", "substrate-state-machine 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1452,16 +1444,24 @@ dependencies = [ "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "fixed-hash 0.1.3 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", - "polkadot-serializer 0.1.0", "pretty_assertions 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.0 (git+https://github.com/rphmeier/rustc-hex.git)", "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-codec 0.1.0", + "substrate-serializer 0.1.0", "twox-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "uint 0.1.2 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", ] +[[package]] +name = "substrate-serializer" +version = "0.1.0" +dependencies = [ + "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "substrate-state-machine" version = "0.1.0" diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml index 0901b92b73..1239525530 100644 --- a/substrate/client/Cargo.toml +++ b/substrate/client/Cargo.toml @@ -9,7 +9,7 @@ log = "0.3" parking_lot = "0.4" substrate-primitives = { path = "../primitives", version = "0.1" } substrate-state-machine = { path = "../state-machine", version = "0.1" } -polkadot-serializer = { path = "../serializer" } +substrate-serializer = { path = "../serializer" } substrate-executor = { path = "../executor" } substrate-codec = { path = "../codec", version = "0.1" } native-runtime = { path = "../native-runtime" } diff --git a/substrate/client/src/lib.rs b/substrate/client/src/lib.rs index d38cda6945..44c2aaa2bf 100644 --- a/substrate/client/src/lib.rs +++ b/substrate/client/src/lib.rs @@ -20,7 +20,7 @@ extern crate substrate_primitives as primitives; extern crate substrate_state_machine as state_machine; -extern crate polkadot_serializer as ser; +extern crate substrate_serializer as ser; extern crate substrate_codec as codec; extern crate substrate_executor; extern crate native_runtime; diff --git a/substrate/executor/Cargo.toml b/substrate/executor/Cargo.toml index 081ade6b0f..4852f173ed 100644 --- a/substrate/executor/Cargo.toml +++ b/substrate/executor/Cargo.toml @@ -5,13 +5,13 @@ authors = ["Parity Technologies "] [dependencies] error-chain = "0.11" -substrate-codec = { path = "../codec", version = "0.1" } -polkadot-runtime-std = { path = "../runtime-std", version = "0.1" } -substrate-primitives = { path = "../primitives", version = "0.1" } -polkadot-serializer = { path = "../serializer", version = "0.1" } -substrate-state-machine = { path = "../state-machine" , version = "0.1" } -native-runtime = { path = "../native-runtime", version = "0.1" } -ed25519 = { path = "../ed25519", version = "0.1" } +substrate-codec = { path = "../codec" } +polkadot-runtime-std = { path = "../runtime-std" } +substrate-primitives = { path = "../primitives" } +substrate-serializer = { path = "../serializer" } +substrate-state-machine = { path = "../state-machine" } +native-runtime = { path = "../native-runtime" } +ed25519 = { path = "../ed25519" } serde = "1.0" serde_derive = "1.0" parity-wasm = "0.15.0" diff --git a/substrate/executor/src/lib.rs b/substrate/executor/src/lib.rs index 9d5a012c34..6b2858dd31 100644 --- a/substrate/executor/src/lib.rs +++ b/substrate/executor/src/lib.rs @@ -30,7 +30,7 @@ extern crate substrate_codec as codec; extern crate polkadot_runtime_std as runtime_std; extern crate substrate_primitives as primitives; -extern crate polkadot_serializer as serializer; +extern crate substrate_serializer as serializer; extern crate substrate_state_machine as state_machine; extern crate ed25519; diff --git a/substrate/network/Cargo.toml b/substrate/network/Cargo.toml index e2e901a0df..6591ebf919 100644 --- a/substrate/network/Cargo.toml +++ b/substrate/network/Cargo.toml @@ -13,7 +13,7 @@ ethcore-io = { git = "https://github.com/paritytech/parity.git" } substrate-primitives = { path = "../primitives" } polkadot-client = { path = "../client" } substrate-state-machine = { path = "../state-machine" } -polkadot-serializer = { path = "../serializer" } +substrate-serializer = { path = "../serializer" } log = "0.3" env_logger = "0.4" rand = "0.3" diff --git a/substrate/network/src/lib.rs b/substrate/network/src/lib.rs index 059ba93221..f1bd64d63f 100644 --- a/substrate/network/src/lib.rs +++ b/substrate/network/src/lib.rs @@ -30,7 +30,7 @@ extern crate ipnetwork; extern crate substrate_primitives as primitives; extern crate polkadot_client as client; extern crate substrate_state_machine as state_machine; -extern crate polkadot_serializer as ser; +extern crate substrate_serializer as ser; extern crate serde; extern crate serde_json; #[macro_use] extern crate serde_derive; diff --git a/substrate/primitives/Cargo.toml b/substrate/primitives/Cargo.toml index 4339977804..558989c76a 100644 --- a/substrate/primitives/Cargo.toml +++ b/substrate/primitives/Cargo.toml @@ -13,10 +13,10 @@ uint = { git = "https://github.com/rphmeier/primitives.git", branch = "compile-f twox-hash = { version = "1.1.0", optional = true } byteorder = { version = "1.1", default_features = false } blake2-rfc = { version = "0.2.18", optional = true } -substrate-codec = { path = "../codec", version = "0.1", default_features = false } +substrate-codec = { path = "../codec", default_features = false } [dev-dependencies] -polkadot-serializer = { path = "../serializer", version = "0.1" } +substrate-serializer = { path = "../serializer" } pretty_assertions = "0.4" [features] diff --git a/substrate/primitives/src/hash.rs b/substrate/primitives/src/hash.rs index 8e7c6f2b8f..788641ed04 100644 --- a/substrate/primitives/src/hash.rs +++ b/substrate/primitives/src/hash.rs @@ -57,7 +57,7 @@ impl_serde!(H512, 64); #[cfg(test)] mod tests { use super::*; - use polkadot_serializer as ser; + use substrate_serializer as ser; #[test] fn test_h160() { diff --git a/substrate/primitives/src/lib.rs b/substrate/primitives/src/lib.rs index ee95d7ca9a..bbeaa40036 100644 --- a/substrate/primitives/src/lib.rs +++ b/substrate/primitives/src/lib.rs @@ -45,7 +45,7 @@ extern crate uint as uint_crate; extern crate core; extern crate substrate_codec as codec; #[cfg(test)] -extern crate polkadot_serializer; +extern crate substrate_serializer; #[cfg(test)] #[macro_use] extern crate pretty_assertions; diff --git a/substrate/primitives/src/parachain.rs b/substrate/primitives/src/parachain.rs index f7dac2fec0..710b044162 100644 --- a/substrate/primitives/src/parachain.rs +++ b/substrate/primitives/src/parachain.rs @@ -136,7 +136,7 @@ impl ::codec::Slicable for Activity { #[cfg(test)] mod tests { use super::*; - use polkadot_serializer as ser; + use substrate_serializer as ser; #[test] fn test_candidate() { diff --git a/substrate/primitives/src/relay/block.rs b/substrate/primitives/src/relay/block.rs index e488d3c1f0..16810bf8a0 100644 --- a/substrate/primitives/src/relay/block.rs +++ b/substrate/primitives/src/relay/block.rs @@ -178,7 +178,7 @@ pub struct Body { mod tests { use super::*; use codec::Slicable; - use polkadot_serializer as ser; + use substrate_serializer as ser; #[test] fn test_header_serialization() { diff --git a/substrate/primitives/src/uint.rs b/substrate/primitives/src/uint.rs index cecf69dd2a..724779a269 100644 --- a/substrate/primitives/src/uint.rs +++ b/substrate/primitives/src/uint.rs @@ -47,7 +47,7 @@ impl_serde!(U512, 8); #[cfg(test)] mod tests { use super::*; - use polkadot_serializer as ser; + use substrate_serializer as ser; macro_rules! test { ($name: ident, $test_name: ident) => { diff --git a/substrate/primitives/src/validator.rs b/substrate/primitives/src/validator.rs index e6cba21e73..acf78f9f3c 100644 --- a/substrate/primitives/src/validator.rs +++ b/substrate/primitives/src/validator.rs @@ -53,7 +53,7 @@ pub struct ValidationResult { #[cfg(test)] mod tests { use super::*; - use polkadot_serializer as ser; + use substrate_serializer as ser; #[test] fn test_validation_result() { diff --git a/substrate/serializer/Cargo.toml b/substrate/serializer/Cargo.toml index 259f43016d..412586599e 100644 --- a/substrate/serializer/Cargo.toml +++ b/substrate/serializer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "polkadot-serializer" +name = "substrate-serializer" version = "0.1.0" authors = ["Parity Technologies "] diff --git a/substrate/serializer/src/lib.rs b/substrate/serializer/src/lib.rs index 9660f95f71..9bdda4d019 100644 --- a/substrate/serializer/src/lib.rs +++ b/substrate/serializer/src/lib.rs @@ -1,20 +1,20 @@ // Copyright 2017 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. +// This file is part of Substrate. -// Polkadot is free software: you can redistribute it and/or modify +// Substrate is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// Polkadot is distributed in the hope that it will be useful, +// Substrate is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . +// along with Substrate. If not, see . -//! Polkadot customizable serde serializer. +//! Substrate customizable serde serializer. //! //! The idea is that we can later change the implementation //! to something more compact, but for now we're using JSON. @@ -42,4 +42,3 @@ pub fn to_vec(value: &T) -> Vec { pub fn to_writer(writer: W, value: &T) -> Result<()> { serde_json::to_writer(writer, value) } - diff --git a/substrate/validator/Cargo.toml b/substrate/validator/Cargo.toml index ca69e1a98f..64bb00118a 100644 --- a/substrate/validator/Cargo.toml +++ b/substrate/validator/Cargo.toml @@ -5,6 +5,6 @@ authors = ["Parity Technologies "] [dependencies] error-chain = "0.11" -substrate-primitives = { path = "../primitives", version = "0.1" } -polkadot-serializer = { path = "../serializer", version = "0.1" } +substrate-primitives = { path = "../primitives" } +substrate-serializer = { path = "../serializer" } serde = "1.0" diff --git a/substrate/validator/src/lib.rs b/substrate/validator/src/lib.rs index 778db0155b..44192f9327 100644 --- a/substrate/validator/src/lib.rs +++ b/substrate/validator/src/lib.rs @@ -19,7 +19,7 @@ #[warn(missing_docs)] extern crate substrate_primitives as primitives; -extern crate polkadot_serializer as serializer; +extern crate substrate_serializer as serializer; extern crate serde; #[macro_use] diff --git a/substrate/wasm-runtime/Cargo.lock b/substrate/wasm-runtime/Cargo.lock index a5ce44c433..96a286f124 100644 --- a/substrate/wasm-runtime/Cargo.lock +++ b/substrate/wasm-runtime/Cargo.lock @@ -381,25 +381,12 @@ version = "0.1.0" dependencies = [ "ed25519 0.1.0", "environmental 0.1.0", - "substrate-state-machine 0.1.0", "pwasm-alloc 0.1.0", "pwasm-libc 0.1.0", "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-codec 0.1.0", "substrate-primitives 0.1.0", - "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "substrate-state-machine" -version = "0.1.0" -dependencies = [ - "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hashdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memorydb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "patricia-trie 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "substrate-primitives 0.1.0", + "substrate-state-machine 0.1.0", "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -633,6 +620,19 @@ dependencies = [ "uint 0.1.2 (git+https://github.com/rphmeier/primitives.git?branch=compile-for-wasm)", ] +[[package]] +name = "substrate-state-machine" +version = "0.1.0" +dependencies = [ + "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hashdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "hex-literal 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memorydb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "patricia-trie 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "substrate-primitives 0.1.0", + "triehash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "syn" version = "0.11.11" 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 d35a213f5219817ceb8ed799f29c5b1626bc8dff..8772bd974e05f427cdeea76cb9c54504ca9f8dfc 100644 GIT binary patch delta 3887 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 delta 3760 zcmZuz4RBP|6~6cGZg!KKO&%m9o4?K7mrb&N3BjKLsYRXviQtm7I<-?fhBa9sVM*d{ z5|nDQwYCIBh`r3bI72nl>KH5P(g!rHXjerHB|1xRimkTnOle`J9cNo{%vh>D_w5gn zHZwQpp7Wi1?z!i0-@z&4!6{?xGA_-x!XGseQcz?vVPdrw6k~27k@Yv11Rn_Yj0^|6 zhr@w^NT6r9Z*TyuExNC7AQ0+{1iSAI4fbqDN`81`pnEtN8IGV^@{2K25Y4}%#kc$h zZ`1YP;BoRGUe7mK8u%82jBnQtSlWqp(zK4`Uv@~V5LKofyu`9n*J+ex#UeGbB}xkQ zvn4LlB^!ZBpnk>DFB2C*k}zOxCzEde^G%Nm;=X+!5bf8uyNRF|HhYT6w3|!!ERek( zUeLWtkagXUlSe)L3~)f`mK(@rx2A0QDF#(788|8^S9|sdR_;BE%VgzpCAi{dHE^k1 zEr>_56#_CZnv($lSjJ4DszdD%0$q9Sm&zV#hf`X6@P!hn8dU!Xx+p)zF}y z^z-vO%{&z@EqT_XnAkE_CRy21tGUoZr4771a;Nc-=PQav{!XOJc;s4PWcUu_@vN|X zWGUXjJtKEz{qytrky@kw7W@$J3fJ@fp$5Ko^zKq&TJp=aT~@?ul`EBkIz7aX1unRkmr za2VwdxBj>nr(^Tc98Ht{d^ z)Wb>VWA7Mb<$(6_V{hTgHLQ{$1^3HngB4MlIdTMWetPe>@fz-Y;`;JjmFmSBcStv; zYc{sOR#@Wm`yavwc;|#)r0VI3G2ErupWIc1Z`Gc9=8DmK8_Q#6WfCqi>z7C!j&fyh zl?a}rA`?Yrp&t0nJpOEjPry;gwzL`Gv|P4zSuJEOD`yoCGutD#pl@1{w1G-pn(4VA z1K!9-r#~6H;MM(;boXu&djx*YHR{rXRf0&JAi0p1obc$tN7XrC&ZSGf@?2rUsf%+K zr}d@<;2&0E8pGdLpxs@>$S=JhiT3;ag}nqKu=~&fY`6_Pw7>imv5I@sE&$;tVzLO; zrP!{@4u?4#3(GaJc<6A2TfmuEShBIm@3Inzg_&6%X8GAzXs;i3ifjL(K`U_pQ`Ovm%tqqX zeCx3rAi)QZ`7wbP{ry)i?B}I3>qY0^J=1-)oXcD!hGoit&WK)^pE*iM%+B|`dZ*~{ z^RKSOBxUE0*Br~Dc0JIOX_C;%G47UE@aLb{MPNwQ?VFP_<(Eqm|8n1SajqtX0fcxU zQBCy<}7>`Rhouf$y6i0c_v= zDt%(ze7551L&{wwisb?ZbQ~VSht3X@S+DlDvp*A4mp}IVKS8@}JGYJ=#>4>eC2OTF z9(e6J+^LygA0%b74U&fyLllT?5j0L@B5l_8#$8z0Irc_1CUGx+|IP10ldgEH3|hV8 zt)q+fb=s;EtFfV8TE*{qqntnf_Id!%yj`-#2L5Ey37Ct1n=k!yjIAL&E==Gh}6!=KLHW$;Vw zyz^8!Zs%K1`LR3weGE6WynCHNV}ESUBMC3>N;<2i-L1q1Pa&*(ql@wrIm=kc+O6eUhVWbN`UeY{?MWQHp!QcUGgytE09{DHT5ml zw+lX2z|!0CCQwLkKk%{AjIO@TDP(nHO)#9Um9kPt8CAey*;Oc`#fs`!vDAhrD~6x2 z)!+l%R+>?pY|=qiaAOr`7;!v|Yby>dsFG>0Qdx%_{Q7sBxh{rH5ezEXf2$7E^<1qTp(9#Bgp7-<^~gy2ze z!3_u6z$|dHGPSiVO-DKb-iTBMVHtEwNkCH|Z3QliZp)zyfKC9qViDSxLnm;Z`YnoE z4RzT(pD)6cr0UdPQv5aSR6nNJ*W`o;=O)6DeoL)xiO9HCnH3D8$Yi>!~dP zN9q?Hc?9<91kTh`Ndlkrih+pK0RoAvSEmZGXRMx@MIiL3L>n?ps0S(I8K!Tb7k;oZ z%s>c&H`zdKQ;;4}Fj1g(pijYqmI1>tK)XQN3``b%2KI0>ptB9&|AUdX0p0&Z1EJ08 zOZnKQ?tp(J+Ncg#aUE_{U(CnNYvvju6Qu}MFEVu~XX*l=2vFxD^jHp!y43Ol48NBy zRVl!X&AF&;2((>`v`^%;Q!e!f1=v?P>829X`yC-c(@syjX$P;m(lG{u9u&ktfOw+A zP!T4ekOvQ40#(^F7!EEE2O}e)VZA1&Je0ICq&(}Prna8J-XKyAc_744Y6B5qj$|09 zWuzR>FrxurPI#zo3tS^QdaL>=ad*6%3k{<9IDYTh&RzX^>6{MrjfyLIti&J^>{I6WTKfD NeQ6`HW-$qz{{`b9n+E^@