put bandersnatch under experimental flag

client/keystore/src/local.rs

@@ -19,13 +19,14 @@
 
 use parking_lot::RwLock;
 use sp_application_crypto::{AppCrypto, AppPair, IsWrappedBy};
+#[cfg(feature = "bandersnatch-experimental")]
+use sp_core::bandersnatch;
+#[cfg(feature = "bls-experimental")]
+use sp_core::{bls377, bls381};
 use sp_core::{
-	bandersnatch,
 	crypto::{ByteArray, ExposeSecret, KeyTypeId, Pair as CorePair, SecretString, VrfSecret},
 	ecdsa, ed25519, sr25519,
 };
-#[cfg(feature = "bls-experimental")]
-use sp_core::{bls377, bls381};
 use sp_keystore::{Error as TraitError, Keystore, KeystorePtr};
 use std::{
 	collections::HashMap,
@@ -235,10 +236,12 @@ impl Keystore for LocalKeystore {
 		Ok(sig)
 	}
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_public_keys(&self, key_type: KeyTypeId) -> Vec<bandersnatch::Public> {
 		self.public_keys::<bandersnatch::Pair>(key_type)
 	}
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_generate_new(
 		&self,
 		key_type: KeyTypeId,
@@ -247,6 +250,7 @@ impl Keystore for LocalKeystore {
 		self.generate_new::<bandersnatch::Pair>(key_type, seed)
 	}
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_sign(
 		&self,
 		key_type: KeyTypeId,
@@ -259,6 +263,7 @@ impl Keystore for LocalKeystore {
 	// TODO DAVXY
 	// Maybe we can expose just this bandersnatch sign (the above one reduces to this with
 	// input len = 0)
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_vrf_sign(
 		&self,
 		key_type: KeyTypeId,

primitives/application-crypto/src/lib.rs

@@ -45,6 +45,7 @@ pub use traits::*;
 
 mod traits;
 
+#[cfg(feature = "bandersnatch-experimental")]
 pub mod bandersnatch;
 #[cfg(feature = "bls-experimental")]
 pub mod bls377;

primitives/core/src/lib.rs

@@ -55,6 +55,7 @@ pub mod crypto;
 pub mod hexdisplay;
 pub use paste;
 
+#[cfg(feature = "bandersnatch-experimental")]
 pub mod bandersnatch;
 #[cfg(feature = "bls-experimental")]
 pub mod bls;

primitives/keystore/src/lib.rs

@@ -19,13 +19,14 @@
 
 pub mod testing;
 
+#[cfg(feature = "bandersnatch-experimental")]
+use sp_core::bandersnatch;
+#[cfg(feature = "bls-experimental")]
+use sp_core::{bls377, bls381};
 use sp_core::{
-	bandersnatch,
 	crypto::{ByteArray, CryptoTypeId, KeyTypeId},
 	ecdsa, ed25519, sr25519,
 };
-#[cfg(feature = "bls-experimental")]
-use sp_core::{bls377, bls381};
 
 use std::sync::Arc;
 
@@ -175,16 +176,19 @@ pub trait Keystore: Send + Sync {
 		msg: &[u8; 32],
 	) -> Result<Option<ecdsa::Signature>, Error>;
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	/// DAVXY TODO
 	fn bandersnatch_public_keys(&self, key_type: KeyTypeId) -> Vec<bandersnatch::Public>;
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	/// DAVXY TODO
 	fn bandersnatch_generate_new(
 		&self,
 		key_type: KeyTypeId,
 		seed: Option<&str>,
 	) -> Result<bandersnatch::Public, Error>;
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	/// DAVXY TODO
 	fn bandersnatch_sign(
 		&self,
@@ -193,6 +197,7 @@ pub trait Keystore: Send + Sync {
 		msg: &[u8],
 	) -> Result<Option<bandersnatch::Signature>, Error>;
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	/// DAVXY TODO
 	fn bandersnatch_vrf_sign(
 		&self,
@@ -319,6 +324,7 @@ pub trait Keystore: Send + Sync {
 
 				self.ecdsa_sign(id, &public, msg)?.map(|s| s.encode())
 			},
+			#[cfg(feature = "bandersnatch-experimental")]
 			bandersnatch::CRYPTO_ID => {
 				let public = bandersnatch::Public::from_slice(public)
 					.map_err(|_| Error::ValidationError("Invalid public key format".into()))?;

primitives/keystore/src/testing.rs

@@ -19,13 +19,14 @@
 
 use crate::{Error, Keystore, KeystorePtr};
 
+#[cfg(feature = "bandersnatch-experimental")]
+use sp_core::bandersnatch;
+#[cfg(feature = "bls-experimental")]
+use sp_core::{bls377, bls381};
 use sp_core::{
-	bandersnatch,
 	crypto::{ByteArray, KeyTypeId, Pair, VrfSecret},
 	ecdsa, ed25519, sr25519,
 };
-#[cfg(feature = "bls-experimental")]
-use sp_core::{bls377, bls381};
 
 use parking_lot::RwLock;
 use std::{collections::HashMap, sync::Arc};
@@ -215,10 +216,12 @@ impl Keystore for MemoryKeystore {
 		Ok(sig)
 	}
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_public_keys(&self, key_type: KeyTypeId) -> Vec<bandersnatch::Public> {
 		self.public_keys::<bandersnatch::Pair>(key_type)
 	}
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_generate_new(
 		&self,
 		key_type: KeyTypeId,
@@ -227,6 +230,7 @@ impl Keystore for MemoryKeystore {
 		self.generate_new::<bandersnatch::Pair>(key_type, seed)
 	}
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_sign(
 		&self,
 		key_type: KeyTypeId,
@@ -236,6 +240,7 @@ impl Keystore for MemoryKeystore {
 		self.sign::<bandersnatch::Pair>(key_type, public, msg)
 	}
 
+	#[cfg(feature = "bandersnatch-experimental")]
 	fn bandersnatch_vrf_sign(
 		&self,
 		key_type: KeyTypeId,