state_machine no_std witness externalities (#6934)

* checkpoint before removing CT from change trie * before trie backend without tx * undo * Started no transaction, but would need using a different root calculation method, out of the scope of this pr, will roll back. * Remove NoTransaction. * partially address review. dummy stats implementation for no_std. * Remove ChangeTrieOverlay. * modified function * Remove witness_ext * need noops changes root * update from cumulus branch * line break * remove warning * line break * From review: renamings and stats active in no std (except time). * include cache, exclude change trie cache with individual temporary bad looking no_std check * little test * fuse imports and filter_map prepare_extrinsics_input_inner fold. * put back ExtInner into Ext, awkward double proto for new function. * Apply suggestions from code review * Update primitives/state-machine/Cargo.toml Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
paritytech · Sep 11, 2020 · b4ee65d · b4ee65d
1 parent 7106a7b
commit b4ee65d
Show file tree

Hide file tree

Showing 18 changed files with 1,194 additions and 779 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/primitives/externalities/Cargo.toml b/primitives/externalities/Cargo.toml
@@ -13,7 +13,16 @@ documentation = "https://docs.rs/sp-externalities"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-storage = { version = "2.0.0-rc6", path = "../storage" }
-sp-std = { version = "2.0.0-rc6", path = "../std" }
-environmental = { version = "1.1.1" }
-codec = { package = "parity-scale-codec", version = "1.3.1" }
+sp-storage = { version = "2.0.0-rc6", path = "../storage", default-features = false }
+sp-std = { version = "2.0.0-rc6", path = "../std", default-features = false }
+environmental = { version = "1.1.1", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"environmental/std",
+  "sp-std/std",
+  "sp-storage/std",
+]
diff --git a/primitives/externalities/src/extensions.rs b/primitives/externalities/src/extensions.rs
@@ -22,7 +22,9 @@
 //!
 //! It is required that each extension implements the [`Extension`] trait.
 
-use std::{collections::HashMap, collections::hash_map::Entry, any::{Any, TypeId}, ops::DerefMut};
+use sp_std::{
+	collections::btree_map::{BTreeMap, Entry}, any::{Any, TypeId}, ops::DerefMut, boxed::Box,
+};
 use crate::Error;
 
 /// Marker trait for types that should be registered as [`Externalities`](crate::Externalities) extension.
@@ -104,9 +106,10 @@ pub trait ExtensionStore {
 /// Stores extensions that should be made available through the externalities.
 #[derive(Default)]
 pub struct Extensions {
-	extensions: HashMap<TypeId, Box<dyn Extension>>,
+	extensions: BTreeMap<TypeId, Box<dyn Extension>>,
 }
 
+#[cfg(feature = "std")]
 impl std::fmt::Debug for Extensions {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		write!(f, "Extensions: ({})", self.extensions.len())

diff --git a/primitives/externalities/src/lib.rs b/primitives/externalities/src/lib.rs
@@ -15,6 +15,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![cfg_attr(not(feature = "std"), no_std)]
+
 //! Substrate externalities abstraction
 //!
 //! The externalities mainly provide access to storage and to registered extensions. Extensions
@@ -23,7 +25,7 @@
 //!
 //! This crate exposes the main [`Externalities`] trait.
 
-use std::any::{Any, TypeId};
+use sp_std::{any::{Any, TypeId}, vec::Vec, boxed::Box};
 
 use sp_storage::{ChildInfo, TrackedStorageKey};
 

diff --git a/primitives/state-machine/Cargo.toml b/primitives/state-machine/Cargo.toml
@@ -13,25 +13,40 @@ documentation = "https://docs.rs/sp-state-machine"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = "0.4.8"
-parking_lot = "0.10.0"
-hash-db = "0.15.2"
-trie-db = "0.22.0"
-trie-root = "0.16.0"
-sp-trie = { version = "2.0.0-rc6", path = "../trie" }
-sp-core = { version = "2.0.0-rc6", path = "../core" }
-sp-panic-handler = { version = "2.0.0-rc6", path = "../panic-handler" }
-codec = { package = "parity-scale-codec", version = "1.3.1" }
-num-traits = "0.2.8"
-rand = "0.7.2"
-sp-externalities = { version = "0.8.0-rc6", path = "../externalities" }
-itertools = "0.9"
+log = { version = "0.4.8", optional = true }
+parking_lot = { version = "0.10.0", optional = true }
+hash-db = { version = "0.15.2", default-features = false }
+trie-db = { version = "0.22.0", default-features = false }
+trie-root = { version = "0.16.0", default-features = false }
+sp-trie = { version = "2.0.0-rc6", path = "../trie", default-features = false }
+sp-core = { version = "2.0.0-rc6", path = "../core", default-features = false }
+sp-panic-handler = { version = "2.0.0-rc6", path = "../panic-handler", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
+num-traits = { version = "0.2.8", default-features = false }
+rand = { version = "0.7.2", optional = true }
+sp-externalities = { version = "0.8.0-rc6", path = "../externalities", default-features = false }
 smallvec = "1.4.1"
+sp-std = { version = "2.0.0-rc6", default-features = false, path = "../std" }
 
 [dev-dependencies]
 hex-literal = "0.3.1"
 sp-runtime = { version = "2.0.0-rc6", path = "../runtime" }
 pretty_assertions = "0.6.1"
 
 [features]
-default = []
+default = ["std"]
+std = [
+	"codec/std",
+	"hash-db/std",
+	"num-traits/std",
+  "sp-core/std",
+  "sp-externalities/std",
+  "sp-std/std",
+	"sp-trie/std",
+	"trie-db/std",
+	"trie-root/std",
+	"log",
+	"parking_lot",
+	"rand",
+  "sp-panic-handler",
+]
diff --git a/primitives/state-machine/src/backend.rs b/primitives/state-machine/src/backend.rs
@@ -20,20 +20,22 @@
 use hash_db::Hasher;
 use codec::{Decode, Encode};
 use sp_core::{
-	traits::RuntimeCode,
 	storage::{ChildInfo, well_known_keys, TrackedStorageKey}
 };
 use crate::{
 	trie_backend::TrieBackend,
 	trie_backend_essence::TrieBackendStorage,
 	UsageInfo, StorageKey, StorageValue, StorageCollection, ChildStorageCollection,
 };
+use sp_std::vec::Vec;
+#[cfg(feature = "std")]
+use sp_core::traits::RuntimeCode;
 
 /// A state backend is used to read state data and can have changes committed
 /// to it.
 ///
 /// The clone operation (if implemented) should be cheap.
-pub trait Backend<H: Hasher>: std::fmt::Debug {
+pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	/// An error type when fetching data is not possible.
 	type Error: super::Error;
 
@@ -375,11 +377,13 @@ pub(crate) fn insert_into_memory_db<H, I>(mdb: &mut sp_trie::MemoryDB<H>, input:
 }
 
 /// Wrapper to create a [`RuntimeCode`] from a type that implements [`Backend`].
+#[cfg(feature = "std")]
 pub struct BackendRuntimeCode<'a, B, H> {
 	backend: &'a B,
 	_marker: std::marker::PhantomData<H>,
 }
 
+#[cfg(feature = "std")]
 impl<'a, B: Backend<H>, H: Hasher> sp_core::traits::FetchRuntimeCode for
 	BackendRuntimeCode<'a, B, H>
 {
@@ -388,6 +392,7 @@ impl<'a, B: Backend<H>, H: Hasher> sp_core::traits::FetchRuntimeCode for
 	}
 }
 
+#[cfg(feature = "std")]
 impl<'a, B: Backend<H>, H: Hasher> BackendRuntimeCode<'a, B, H> where H::Out: Encode {
 	/// Create a new instance.
 	pub fn new(backend: &'a B) -> Self {

diff --git a/primitives/state-machine/src/changes_trie/build.rs b/primitives/state-machine/src/changes_trie/build.rs
@@ -140,8 +140,15 @@ fn prepare_extrinsics_input_inner<'a, B, H, Number>(
 		Number: BlockNumber,
 {
 	changes
-		.filter(|( _, v)| v.extrinsics().next().is_some())
-		.try_fold(BTreeMap::new(), |mut map: BTreeMap<&[u8], (ExtrinsicIndex<Number>, Vec<u32>)>, (k, v)| {
+		.filter_map(|(k, v)| {
+			let extrinsics = v.extrinsics();
+			if !extrinsics.is_empty() {
+				Some((k, extrinsics))
+			} else {
+				None
+			}
+		})
+		.try_fold(BTreeMap::new(), |mut map: BTreeMap<&[u8], (ExtrinsicIndex<Number>, Vec<u32>)>, (k, extrinsics)| {
 			match map.entry(k) {
 				Entry::Vacant(entry) => {
 					// ignore temporary values (values that have null value at the end of operation
@@ -161,7 +168,7 @@ fn prepare_extrinsics_input_inner<'a, B, H, Number>(
 						}
 					};
 
-					let extrinsics = v.extrinsics().cloned().collect();
+					let extrinsics = extrinsics.into_iter().collect();
 					entry.insert((ExtrinsicIndex {
 						block: block.clone(),
 						key: k.to_vec(),
@@ -170,11 +177,11 @@ fn prepare_extrinsics_input_inner<'a, B, H, Number>(
 				Entry::Occupied(mut entry) => {
 					// we do not need to check for temporary values here, because entry is Occupied
 					// AND we are checking it before insertion
-					let extrinsics = &mut entry.get_mut().1;
-					extrinsics.extend(
-						v.extrinsics().cloned()
+					let entry_extrinsics = &mut entry.get_mut().1;
+					entry_extrinsics.extend(
+						extrinsics.into_iter()
 					);
-					extrinsics.sort();
+					entry_extrinsics.sort();
 				},
 			}
 

diff --git a/primitives/state-machine/src/changes_trie/mod.rs b/primitives/state-machine/src/changes_trie/mod.rs
@@ -85,9 +85,6 @@ use crate::{
 	},
 };
 
-/// Changes that are made outside of extrinsics are marked with this index;
-pub const NO_EXTRINSIC_INDEX: u32 = 0xffffffff;
-
 /// Requirements for block number that can be used with changes tries.
 pub trait BlockNumber:
 	Send + Sync + 'static +

diff --git a/primitives/state-machine/src/error.rs b/primitives/state-machine/src/error.rs
@@ -17,7 +17,7 @@
 
 /// State Machine Errors
 
-use std::fmt;
+use sp_std::fmt;
 
 /// State Machine Error bound.
 ///
@@ -34,7 +34,7 @@ impl<T: 'static + fmt::Debug + fmt::Display + Send> Error for T {}
 #[derive(Debug, Eq, PartialEq)]
 pub enum ExecutionError {
 	/// Backend error.
-	Backend(String),
+	Backend(crate::DefaultError),
 	/// The entry `:code` doesn't exist in storage so there's no way we can execute anything.
 	CodeEntryDoesNotExist,
 	/// Backend is incompatible with execution proof generation process.