Add error information to invoice's JSON format

Author: majecty

types/src/invoice/parcel_invoice.rs

@@ -15,7 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use rlp::{Decodable, DecoderError, Encodable, RlpStream, UntrustedRlp};
-use serde::ser::SerializeSeq;
+use serde::ser::{SerializeSeq, SerializeStruct};
 use serde::{Serialize, Serializer};
 
 use super::super::parcel::Error;
@@ -38,8 +38,17 @@ impl Serialize for ParcelInvoice {
     where
         S: Serializer, {
         match self {
-            ParcelInvoice::SingleSuccess => serializer.serialize_str("Success"),
-            ParcelInvoice::SingleFail(ref _err) => serializer.serialize_str("Failed"),
+            ParcelInvoice::SingleSuccess => {
+                let mut s = serializer.serialize_struct("ParcelInvoice", 1)?;
+                s.serialize_field("success", &true)?;
+                s.end()
+            }
+            ParcelInvoice::SingleFail(ref err) => {
+                let mut s = serializer.serialize_struct("ParcelInvoice", 2)?;
+                s.serialize_field("success", &false)?;
+                s.serialize_field("error", err)?;
+                s.end()
+            }
             ParcelInvoice::Multiple(transaction_invoices) => {
                 let mut s = serializer.serialize_seq(Some(transaction_invoices.len()))?;
                 for transaction_invoice in transaction_invoices {

types/src/invoice/transaction_invoice.rs

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use rlp::{Decodable, DecoderError, Encodable, RlpStream, UntrustedRlp};
+use serde::ser::SerializeStruct;
 use serde::{Serialize, Serializer};
 
 use super::super::transaction::Error;
@@ -35,8 +36,17 @@ impl Serialize for TransactionInvoice {
     where
         S: Serializer, {
         match self {
-            TransactionInvoice::Success => serializer.serialize_str("Success"),
-            TransactionInvoice::Fail(_err) => serializer.serialize_str("Failed"),
+            TransactionInvoice::Success => {
+                let mut s = serializer.serialize_struct("TransactionInvoice", 1)?;
+                s.serialize_field("success", &true)?;
+                s.end()
+            }
+            TransactionInvoice::Fail(err) => {
+                let mut s = serializer.serialize_struct("TransactionInvoice", 2)?;
+                s.serialize_field("success", &false)?;
+                s.serialize_field("error", err)?;
+                s.end()
+            }
         }
     }
 }

types/src/parcel/error.rs

@@ -25,6 +25,7 @@ use super::super::util::unexpected::Mismatch;
 use super::super::ShardId;
 
 #[derive(Debug, PartialEq, Clone, Serialize)]
+#[serde(tag = "type", content = "content")]
 /// Errors concerning parcel processing.
 pub enum Error {
     /// Parcel is already imported to the queue

types/src/transaction/error.rs

@@ -24,6 +24,7 @@ use super::super::util::unexpected::Mismatch;
 use super::super::{ShardId, WorldId};
 
 #[derive(Debug, PartialEq, Clone, Eq, Serialize)]
+#[serde(tag = "type", content = "content")]
 pub enum Error {
     InvalidAssetAmount {
         address: H256,