Skip to content

Commit

Permalink
Revert "Remove error serialization/deserialization (#3110)" (#3151)
Browse files Browse the repository at this point in the history
This reverts commit 76ac941.
  • Loading branch information
hashmap authored and yeastplume committed Nov 29, 2019
1 parent 3f528a8 commit ba9cdd3
Show file tree
Hide file tree
Showing 7 changed files with 469 additions and 15 deletions.
2 changes: 1 addition & 1 deletion core/src/core/committed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use util::secp::pedersen::Commitment;
use util::{secp, secp_static, static_secp_instance};

/// Errors from summing and verifying kernel excesses via committed trait.
#[derive(Debug, Clone, PartialEq, Eq, Fail)]
#[derive(Debug, Clone, PartialEq, Eq, Fail, Serialize, Deserialize)]
pub enum Error {
/// Keychain related error.
#[fail(display = "Keychain error {}", _0)]
Expand Down
2 changes: 1 addition & 1 deletion core/src/core/transaction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ impl Readable for KernelFeatures {
}

/// Errors thrown by Transaction validation
#[derive(Clone, Eq, Debug, PartialEq)]
#[derive(Clone, Eq, Debug, PartialEq, Serialize, Deserialize)]
pub enum Error {
/// Underlying Secp256k1 error (signature validation or invalid public key
/// typically)
Expand Down
2 changes: 1 addition & 1 deletion core/src/libtx/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub struct Error {
inner: Context<ErrorKind>,
}

#[derive(Clone, Debug, Eq, Fail, PartialEq)]
#[derive(Clone, Debug, Eq, Fail, PartialEq, Serialize, Deserialize)]
/// Libwallet error types
pub enum ErrorKind {
/// SECP error
Expand Down
Loading

0 comments on commit ba9cdd3

Please sign in to comment.