diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index d9cb87af47..547721957e 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -10900,7 +10900,6 @@ dependencies = [ "sp-debug-derive", "sp-externalities", "sp-runtime-interface", - "sp-serializer", "sp-std", "sp-storage", "ss58-registry", @@ -11218,14 +11217,6 @@ dependencies = [ "substrate-wasm-builder", ] -[[package]] -name = "sp-serializer" -version = "4.0.0-dev" -dependencies = [ - "serde", - "serde_json", -] - [[package]] name = "sp-session" version = "4.0.0-dev" diff --git a/substrate/Cargo.toml b/substrate/Cargo.toml index 7563a4a643..2b1659d4fb 100644 --- a/substrate/Cargo.toml +++ b/substrate/Cargo.toml @@ -219,7 +219,6 @@ members = [ "primitives/runtime-interface/test", "primitives/runtime-interface/test-wasm", "primitives/runtime-interface/test-wasm-deprecated", - "primitives/serializer", "primitives/session", "primitives/staking", "primitives/state-machine", diff --git a/substrate/primitives/core/Cargo.toml b/substrate/primitives/core/Cargo.toml index 0c203a03d9..f99ed6c53e 100644 --- a/substrate/primitives/core/Cargo.toml +++ b/substrate/primitives/core/Cargo.toml @@ -56,7 +56,6 @@ sp-runtime-interface = { version = "7.0.0", default-features = false, path = ".. w3f-bls = { version = "0.1.3", default-features = false, optional = true} [dev-dependencies] -sp-serializer = { version = "4.0.0-dev", path = "../serializer" } rand = "0.8.5" criterion = "0.4.0" serde_json = "1.0" diff --git a/substrate/primitives/core/src/hash.rs b/substrate/primitives/core/src/hash.rs index ec7da98296..ece9b1af79 100644 --- a/substrate/primitives/core/src/hash.rs +++ b/substrate/primitives/core/src/hash.rs @@ -32,7 +32,6 @@ pub fn convert_hash, H2: AsRef<[u8]>>(src: &H2) -> H1 #[cfg(test)] mod tests { use super::*; - use sp_serializer as ser; #[test] fn test_h160() { @@ -47,8 +46,11 @@ mod tests { ]; for (number, expected) in tests { - assert_eq!(format!("{:?}", expected), ser::to_string_pretty(&number)); - assert_eq!(number, ser::from_str(&format!("{:?}", expected)).unwrap()); + assert_eq!( + format!("{:?}", expected), + serde_json::to_string_pretty(&number).expect("Json pretty print failed") + ); + assert_eq!(number, serde_json::from_str(&format!("{:?}", expected)).unwrap()); } } @@ -86,30 +88,33 @@ mod tests { ]; for (number, expected) in tests { - assert_eq!(format!("{:?}", expected), ser::to_string_pretty(&number)); - assert_eq!(number, ser::from_str(&format!("{:?}", expected)).unwrap()); + assert_eq!( + format!("{:?}", expected), + serde_json::to_string_pretty(&number).expect("Json pretty print failed") + ); + assert_eq!(number, serde_json::from_str(&format!("{:?}", expected)).unwrap()); } } #[test] fn test_invalid() { - assert!(ser::from_str::( + assert!(serde_json::from_str::( "\"0x000000000000000000000000000000000000000000000000000000000000000\"" ) .unwrap_err() .is_data()); - assert!(ser::from_str::( + assert!(serde_json::from_str::( "\"0x000000000000000000000000000000000000000000000000000000000000000g\"" ) .unwrap_err() .is_data()); - assert!(ser::from_str::( + assert!(serde_json::from_str::( "\"0x00000000000000000000000000000000000000000000000000000000000000000\"" ) .unwrap_err() .is_data()); - assert!(ser::from_str::("\"\"").unwrap_err().is_data()); - assert!(ser::from_str::("\"0\"").unwrap_err().is_data()); - assert!(ser::from_str::("\"10\"").unwrap_err().is_data()); + assert!(serde_json::from_str::("\"\"").unwrap_err().is_data()); + assert!(serde_json::from_str::("\"0\"").unwrap_err().is_data()); + assert!(serde_json::from_str::("\"10\"").unwrap_err().is_data()); } } diff --git a/substrate/primitives/core/src/uint.rs b/substrate/primitives/core/src/uint.rs index df49511e84..b251671dbe 100644 --- a/substrate/primitives/core/src/uint.rs +++ b/substrate/primitives/core/src/uint.rs @@ -23,7 +23,6 @@ pub use primitive_types::{U256, U512}; mod tests { use super::*; use codec::{Decode, Encode}; - use sp_serializer as ser; macro_rules! test { ($name: ident, $test_name: ident) => { @@ -43,14 +42,17 @@ mod tests { ]; for (number, expected) in tests { - assert_eq!(format!("{:?}", expected), ser::to_string_pretty(&number)); - assert_eq!(number, ser::from_str(&format!("{:?}", expected)).unwrap()); + assert_eq!( + format!("{:?}", expected), + serde_json::to_string_pretty(&number).expect("Json pretty print failed") + ); + assert_eq!(number, serde_json::from_str(&format!("{:?}", expected)).unwrap()); } // Invalid examples - assert!(ser::from_str::<$name>("\"0x\"").unwrap_err().is_data()); - assert!(ser::from_str::<$name>("\"0xg\"").unwrap_err().is_data()); - assert!(ser::from_str::<$name>("\"\"").unwrap_err().is_data()); + assert!(serde_json::from_str::<$name>("\"0x\"").unwrap_err().is_data()); + assert!(serde_json::from_str::<$name>("\"0xg\"").unwrap_err().is_data()); + assert!(serde_json::from_str::<$name>("\"\"").unwrap_err().is_data()); } }; } @@ -78,10 +80,10 @@ mod tests { #[test] fn test_large_values() { assert_eq!( - ser::to_string_pretty(&!U256::zero()), + serde_json::to_string_pretty(&!U256::zero()).expect("Json pretty print failed"), "\"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"" ); - assert!(ser::from_str::( + assert!(serde_json::from_str::( "\"0x1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\"" ) .unwrap_err() diff --git a/substrate/primitives/serializer/Cargo.toml b/substrate/primitives/serializer/Cargo.toml deleted file mode 100644 index 585e4b4e0d..0000000000 --- a/substrate/primitives/serializer/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "sp-serializer" -version = "4.0.0-dev" -authors = ["Parity Technologies "] -edition = "2021" -license = "Apache-2.0" -homepage = "https://substrate.io" -repository = "https://github.com/paritytech/substrate/" -description = "Substrate customizable serde serializer." -documentation = "https://docs.rs/sp-serializer" -readme = "README.md" - -[package.metadata.docs.rs] -targets = ["x86_64-unknown-linux-gnu"] - -[dependencies] -serde = "1.0.136" -serde_json = "1.0.85" diff --git a/substrate/primitives/serializer/README.md b/substrate/primitives/serializer/README.md deleted file mode 100644 index 083a0857cc..0000000000 --- a/substrate/primitives/serializer/README.md +++ /dev/null @@ -1,6 +0,0 @@ -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. - -License: Apache-2.0 \ No newline at end of file diff --git a/substrate/primitives/serializer/src/lib.rs b/substrate/primitives/serializer/src/lib.rs deleted file mode 100644 index 3d42707143..0000000000 --- a/substrate/primitives/serializer/src/lib.rs +++ /dev/null @@ -1,45 +0,0 @@ -// This file is part of Substrate. - -// Copyright (C) Parity Technologies (UK) Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! 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. - -#![warn(missing_docs)] - -pub use serde_json::{from_reader, from_slice, from_str, Error, Result}; - -const PROOF: &str = "Serializers are infallible; qed"; - -/// Serialize the given data structure as a pretty-printed String of JSON. -pub fn to_string_pretty(value: &T) -> String { - serde_json::to_string_pretty(value).expect(PROOF) -} - -/// Serialize the given data structure as a JSON byte vector. -pub fn encode(value: &T) -> Vec { - serde_json::to_vec(value).expect(PROOF) -} - -/// Serialize the given data structure as JSON into the IO stream. -pub fn to_writer( - writer: W, - value: &T, -) -> Result<()> { - serde_json::to_writer(writer, value) -}