removed schema validation, refactored encode_data

openethereum · Oct 1, 2018 · e95b996 · e95b996
1 parent c3f154b
commit e95b996
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 339 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/util/EIP-712/Cargo.toml b/util/EIP-712/Cargo.toml
@@ -15,7 +15,6 @@ failure = "0.1"
 itertools="0.7"
 failure_derive = "0.1"
 lazy_static = "1.1"
-valico = "2.2"
 linked_hash_set = "0.1.3"
 toolshed = "0.4"
 lunarity = { git = "https://github.com/paritytech/lunarity" }

diff --git a/util/EIP-712/src/eip712.rs b/util/EIP-712/src/eip712.rs
@@ -23,7 +23,6 @@ use ethereum_types::{U256, H256, Address};
 
 pub(crate) type MessageTypes = HashMap<String, Vec<FieldType>>;
 
-
 #[serde(rename_all = "camelCase")]
 #[serde(deny_unknown_fields)]
 #[derive(Deserialize, Serialize, Debug, Clone)]

diff --git a/util/EIP-712/src/error.rs b/util/EIP-712/src/error.rs
@@ -56,8 +56,8 @@ pub enum ErrorKind {
 	UnsupportedArrayDepth
 }
 
-pub(crate) fn serde_error(expected: &str, field: &str) -> ErrorKind {
-	ErrorKind::UnexpectedType(expected.to_owned(), field.to_owned())
+pub(crate) fn serde_error(expected: &str, field: Option<&str>) -> ErrorKind {
+	ErrorKind::UnexpectedType(expected.to_owned(), field.unwrap_or("").to_owned())
 }