session: don't have primitives depend on frame_support

frame/support/src/lib.rs

@@ -30,11 +30,11 @@ pub use sp_tracing;
 
 #[cfg(feature = "std")]
 pub use serde;
+pub use sp_core::Void;
 #[doc(hidden)]
 pub use sp_std;
 #[doc(hidden)]
 pub use codec;
-use codec::{Decode, Encode};
 #[cfg(feature = "std")]
 #[doc(hidden)]
 pub use once_cell;
@@ -364,11 +364,6 @@ macro_rules! assert_ok {
 	}
 }
 
-/// The void type - it cannot exist.
-// Oh rust, you crack me up...
-#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug)]
-pub enum Void {}
-
 #[cfg(feature = "std")]
 #[doc(hidden)]
 pub use serde::{Serialize, Deserialize};

primitives/core/src/lib.rs

@@ -331,6 +331,11 @@ pub fn to_substrate_wasm_fn_return_value(value: &impl Encode) -> u64 {
 	res
 }
 
+/// The void type - it cannot exist.
+// Oh rust, you crack me up...
+#[derive(Clone, Decode, Encode, Eq, PartialEq, RuntimeDebug)]
+pub enum Void {}
+
 /// Macro for creating `Maybe*` marker traits.
 ///
 /// Such a maybe-marker trait requires the given bound when `feature = std` and doesn't require

primitives/session/Cargo.toml

@@ -13,7 +13,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
-frame-support = { version = "2.0.0-rc3", default-features = false, path = "../../frame/support" }
 sp-api = { version = "2.0.0-rc3", default-features = false, path = "../api" }
 sp-core = { version = "2.0.0-rc3", default-features = false, path = "../core" }
 sp-std = { version = "2.0.0-rc3", default-features = false, path = "../std" }
@@ -24,7 +23,6 @@ sp-runtime = { version = "2.0.0-rc3", optional = true, path = "../runtime" }
 default = [ "std" ]
 std = [
 	"codec/std",
-	"frame-support/std",
 	"sp-api/std",
 	"sp-core/std",
 	"sp-std/std",

primitives/session/src/lib.rs

@@ -82,13 +82,13 @@ pub trait GetValidatorCount {
 	fn validator_count(&self) -> ValidatorCount;
 }
 
-impl GetSessionNumber for frame_support::Void {
+impl GetSessionNumber for sp_core::Void {
 	fn session(&self) -> SessionIndex {
 		Default::default()
 	}
 }
 
-impl GetValidatorCount for frame_support::Void {
+impl GetValidatorCount for sp_core::Void {
 	fn validator_count(&self) -> ValidatorCount {
 		Default::default()
 	}