Remove unnecessary bounds on IdentityField

Signed-off-by: georgepisaltu <[email protected]>

Author: georgepisaltu

substrate/frame/identity/src/simple.rs

@@ -28,7 +28,7 @@ use crate::types::{Data, IdentityFields, IdentityInformationProvider, U64BitFlag
 /// in the `IdentityInfo` struct.
 #[bitflags]
 #[repr(u64)]
-#[derive(MaxEncodedLen, Clone, Copy, PartialEq, Eq, RuntimeDebug)]
+#[derive(Clone, Copy, PartialEq, Eq, RuntimeDebug)]
 pub enum IdentityField {
 	Display = 1u64 << 0,
 	Legal = 1u64 << 1,
@@ -58,38 +58,6 @@ impl TypeInfo for IdentityField {
 	}
 }
 
-impl Encode for IdentityField {
-	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
-		let x: u8 = match self {
-			IdentityField::Display => 0,
-			IdentityField::Legal => 1,
-			IdentityField::Web => 2,
-			IdentityField::Riot => 3,
-			IdentityField::Email => 4,
-			IdentityField::PgpFingerprint => 5,
-			IdentityField::Image => 6,
-			IdentityField::Twitter => 7,
-		};
-		f(&x.encode())
-	}
-}
-
-impl Decode for IdentityField {
-	fn decode<I: codec::Input>(input: &mut I) -> Result<Self, codec::Error> {
-		match u8::decode(input) {
-			Ok(0) => Ok(IdentityField::Display),
-			Ok(1) => Ok(IdentityField::Legal),
-			Ok(2) => Ok(IdentityField::Web),
-			Ok(3) => Ok(IdentityField::Riot),
-			Ok(4) => Ok(IdentityField::Email),
-			Ok(5) => Ok(IdentityField::PgpFingerprint),
-			Ok(6) => Ok(IdentityField::Image),
-			Ok(7) => Ok(IdentityField::Twitter),
-			_ => Err("Invalid IdentityField representation".into()),
-		}
-	}
-}
-
 impl U64BitFlag for IdentityField {}
 
 /// Information concerning the identity of the controller of an account.

substrate/frame/identity/src/types.rs

@@ -236,15 +236,7 @@ pub trait IdentityInformationProvider:
 {
 	/// Type capable of representing all of the fields present in the identity information as bit
 	/// flags in `u64` format.
-	type IdentityField: Encode
-		+ Decode
-		+ MaxEncodedLen
-		+ Clone
-		+ Debug
-		+ Eq
-		+ PartialEq
-		+ TypeInfo
-		+ U64BitFlag;
+	type IdentityField: Clone + Debug + Eq + PartialEq + TypeInfo + U64BitFlag;
 
 	fn has_identity(&self, fields: u64) -> bool;
 	#[cfg(feature = "runtime-benchmarks")]
@@ -292,7 +284,7 @@ impl<
 pub struct RegistrarInfo<
 	Balance: Encode + Decode + Clone + Debug + Eq + PartialEq,
 	AccountId: Encode + Decode + Clone + Debug + Eq + PartialEq,
-	IdField: Encode + Decode + MaxEncodedLen + Clone + Debug + Eq + PartialEq + TypeInfo + U64BitFlag,
+	IdField: Clone + Debug + Eq + PartialEq + TypeInfo + U64BitFlag,
 > {
 	/// The account of the registrar.
 	pub account: AccountId,
@@ -325,21 +317,20 @@ where
 }
 
 impl<IdField: U64BitFlag + PartialEq> Eq for IdentityFields<IdField> {}
-impl<IdField: Encode + Decode + U64BitFlag> Encode for IdentityFields<IdField> {
+impl<IdField: U64BitFlag> Encode for IdentityFields<IdField> {
 	fn using_encoded<R, F: FnOnce(&[u8]) -> R>(&self, f: F) -> R {
 		let bits: u64 = self.0.bits();
 		bits.using_encoded(f)
 	}
 }
-impl<IdField: Encode + Decode + U64BitFlag> Decode for IdentityFields<IdField> {
+impl<IdField: U64BitFlag> Decode for IdentityFields<IdField> {
 	fn decode<I: codec::Input>(input: &mut I) -> sp_std::result::Result<Self, codec::Error> {
 		let field = u64::decode(input)?;
 		Ok(Self(<BitFlags<IdField>>::from_bits(field).map_err(|_| "invalid value")?))
 	}
 }
-impl<
-		IdField: Encode + Decode + MaxEncodedLen + Clone + Debug + Eq + PartialEq + TypeInfo + U64BitFlag,
-	> TypeInfo for IdentityFields<IdField>
+impl<IdField: Clone + Debug + Eq + PartialEq + TypeInfo + U64BitFlag> TypeInfo
+	for IdentityFields<IdField>
 {
 	type Identity = Self;