Skip to content

Commit a45e14f

Browse files
majectysgkim126
authored andcommitted
Serialize invoices using an old method
1 parent 93bc0f0 commit a45e14f

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

types/src/invoice/parcel_invoice.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// along with this program. If not, see <https://www.gnu.org/licenses/>.
1616

1717
use rlp::{Decodable, DecoderError, Encodable, RlpStream, UntrustedRlp};
18-
use serde::ser::{SerializeSeq, SerializeStruct};
18+
use serde::ser::SerializeSeq;
1919
use serde::{Serialize, Serializer};
2020

2121
use super::super::parcel::Error;
@@ -38,17 +38,8 @@ impl Serialize for ParcelInvoice {
3838
where
3939
S: Serializer, {
4040
match self {
41-
ParcelInvoice::SingleSuccess => {
42-
let mut s = serializer.serialize_struct("ParcelInvoice", 1)?;
43-
s.serialize_field("success", &true)?;
44-
s.end()
45-
}
46-
ParcelInvoice::SingleFail(ref err) => {
47-
let mut s = serializer.serialize_struct("ParcelInvoice", 2)?;
48-
s.serialize_field("success", &false)?;
49-
s.serialize_field("error", err)?;
50-
s.end()
51-
}
41+
ParcelInvoice::SingleSuccess => serializer.serialize_str("Success"),
42+
ParcelInvoice::SingleFail(ref _err) => serializer.serialize_str("Failed"),
5243
ParcelInvoice::Multiple(transaction_invoices) => {
5344
let mut s = serializer.serialize_seq(Some(transaction_invoices.len()))?;
5445
for transaction_invoice in transaction_invoices {

types/src/invoice/transaction_invoice.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
// along with this program. If not, see <https://www.gnu.org/licenses/>.
1616

1717
use rlp::{Decodable, DecoderError, Encodable, RlpStream, UntrustedRlp};
18-
use serde::ser::SerializeStruct;
1918
use serde::{Serialize, Serializer};
2019

2120
use super::super::transaction::Error;
@@ -36,17 +35,8 @@ impl Serialize for TransactionInvoice {
3635
where
3736
S: Serializer, {
3837
match self {
39-
TransactionInvoice::Success => {
40-
let mut s = serializer.serialize_struct("TransactionInvoice", 1)?;
41-
s.serialize_field("success", &true)?;
42-
s.end()
43-
}
44-
TransactionInvoice::Fail(err) => {
45-
let mut s = serializer.serialize_struct("TransactionInvoice", 2)?;
46-
s.serialize_field("success", &false)?;
47-
s.serialize_field("error", err)?;
48-
s.end()
49-
}
38+
TransactionInvoice::Success => serializer.serialize_str("Success"),
39+
TransactionInvoice::Fail(_err) => serializer.serialize_str("Failed"),
5040
}
5141
}
5242
}

0 commit comments

Comments
 (0)