fix merge issue

elpiel · elpiel · commit 16a1171b3c34 · 2019-12-27T08:53:45.000+02:00
diff --git a/primitives/src/validator.rs b/primitives/src/validator.rs
@@ -44,12 +44,6 @@ impl AsRef<[u8]> for ValidatorId {
     }
 }
 
-impl From<&[u8; 20]> for ValidatorId {
-    fn from(bytes: &[u8; 20]) -> Self {
-        Self(*bytes)
-    }
-}
-
 impl TryFrom<&str> for ValidatorId {
     type Error = DomainError;
     fn try_from(value: &str) -> Result<Self, Self::Error> {

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,6 @@ impl AsRef<[u8]> for ValidatorId {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`-impl From<&[u8; 20]> for ValidatorId {`
`48`		`- fn from(bytes: &[u8; 20]) -> Self {`
`49`		`- Self(*bytes)`
`50`		`- }`
`51`		`-}`
`52`		`-`
`53`	`47`	`impl TryFrom<&str> for ValidatorId {`
`54`	`48`	`type Error = DomainError;`
`55`	`49`	`fn try_from(value: &str) -> Result<Self, Self::Error> {`