chore(proto): adjust errors

dashpay · Apr 13, 2023 · c3a731a · c3a731a
1 parent 5de378e
commit c3a731a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/proto/src/error.rs b/proto/src/error.rs
@@ -28,6 +28,11 @@ define_error! {
         ParseLength
             [ DisplayOnly<TryFromIntError> ]
             | _ | { "error parsing encoded length" },
+
+        CreateCanonical
+        [ DisplayOnly<String> ]
+        | _ | { "cannot prepare canonical form: {}" },
+
     }
 }
 

diff --git a/proto/src/signatures.rs b/proto/src/signatures.rs
@@ -31,7 +31,7 @@ impl SignBytes for StateId {
     fn sign_bytes(&self, _ctx: &SignContext) -> Result<Vec<u8>, Error> {
         let mut buf = Vec::new();
         self.encode_length_delimited(&mut buf)
-            .map_err(Error::EncodeMessage)?;
+            .map_err(Error::encode_message)?;
 
         Ok(buf.to_vec())
     }
@@ -51,7 +51,7 @@ impl SignBytes for BlockId {
         let mut buf = Vec::new();
         block_id
             .encode_length_delimited(&mut buf)
-            .map_err(Error::EncodeMessage)?;
+            .map_err(Error::encode_message)?;
 
         Ok(buf)
     }
@@ -62,7 +62,7 @@ impl SignBytes for Vote {
         let block_id = self
             .block_id
             .clone()
-            .ok_or(Error::CreateCanonical(String::from(
+            .ok_or(Error::create_canonical(String::from(
                 "missing vote.block id",
             )))?;
 
@@ -76,7 +76,7 @@ impl SignBytes for Commit {
         let block_id = self
             .block_id
             .clone()
-            .ok_or(Error::CreateCanonical(String::from(
+            .ok_or(Error::create_canonical(String::from(
                 "missing vote.block id",
             )))?;
 
@@ -106,7 +106,7 @@ fn vote_sign_bytes(
     let state_id = block_id.state_id.clone();
     let block_id = block_id.sha256(ctx)?;
 
-    buf.put_i32_le(vote_type.into());
+    buf.put_i32_le(vote_type);
     buf.put_i64_le(height);
     buf.put_i64_le(round);