Skip to content

Commit af28628

Browse files
committed
Derive Serialize and Deserialize for all API types
1 parent 413da8c commit af28628

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

json/src/lib.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ pub enum GetTransactionResultDetailCategory {
669669
Orphan,
670670
}
671671

672-
#[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
672+
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
673673
pub struct GetTransactionResultDetail {
674674
pub address: Option<Address<NetworkUnchecked>>,
675675
pub category: GetTransactionResultDetailCategory,
@@ -682,7 +682,7 @@ pub struct GetTransactionResultDetail {
682682
pub abandoned: Option<bool>,
683683
}
684684

685-
#[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
685+
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
686686
pub struct WalletTxInfo {
687687
pub confirmations: i32,
688688
pub blockhash: Option<bitcoin::BlockHash>,
@@ -699,7 +699,7 @@ pub struct WalletTxInfo {
699699
pub wallet_conflicts: Vec<bitcoin::Txid>,
700700
}
701701

702-
#[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
702+
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
703703
pub struct GetTransactionResult {
704704
#[serde(flatten)]
705705
pub info: WalletTxInfo,
@@ -718,7 +718,7 @@ impl GetTransactionResult {
718718
}
719719
}
720720

721-
#[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
721+
#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
722722
pub struct ListTransactionResult {
723723
#[serde(flatten)]
724724
pub info: WalletTxInfo,
@@ -729,7 +729,7 @@ pub struct ListTransactionResult {
729729
pub comment: Option<String>,
730730
}
731731

732-
#[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
732+
#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
733733
pub struct ListSinceBlockResult {
734734
pub transactions: Vec<ListTransactionResult>,
735735
#[serde(default)]
@@ -1853,7 +1853,7 @@ impl serde::Serialize for SigHashType {
18531853
}
18541854

18551855
// Used for createrawtransaction argument.
1856-
#[derive(Serialize, Clone, PartialEq, Eq, Debug)]
1856+
#[derive(Serialize, Clone, PartialEq, Eq, Debug, Deserialize)]
18571857
#[serde(rename_all = "camelCase")]
18581858
pub struct CreateRawTransactionInput {
18591859
pub txid: bitcoin::Txid,
@@ -1862,7 +1862,7 @@ pub struct CreateRawTransactionInput {
18621862
pub sequence: Option<u32>,
18631863
}
18641864

1865-
#[derive(Serialize, Clone, PartialEq, Eq, Debug, Default)]
1865+
#[derive(Serialize, Clone, PartialEq, Eq, Debug, Default, Deserialize)]
18661866
#[serde(rename_all = "camelCase")]
18671867
pub struct FundRawTransactionOptions {
18681868
/// For a transaction with existing inputs, automatically include more if they are not enough (default true).
@@ -1894,7 +1894,7 @@ pub struct FundRawTransactionOptions {
18941894
pub estimate_mode: Option<EstimateMode>,
18951895
}
18961896

1897-
#[derive(Deserialize, Clone, PartialEq, Eq, Debug)]
1897+
#[derive(Deserialize, Clone, PartialEq, Eq, Debug, Serialize)]
18981898
#[serde(rename_all = "camelCase")]
18991899
pub struct FundRawTransactionResult {
19001900
#[serde(with = "crate::serde_hex")]
@@ -1905,7 +1905,7 @@ pub struct FundRawTransactionResult {
19051905
pub change_position: i32,
19061906
}
19071907

1908-
#[derive(Deserialize, Clone, PartialEq, Eq, Debug)]
1908+
#[derive(Deserialize, Clone, PartialEq, Eq, Debug, Serialize)]
19091909
pub struct GetBalancesResultEntry {
19101910
#[serde(with = "bitcoin::amount::serde::as_btc")]
19111911
pub trusted: Amount,
@@ -1915,7 +1915,7 @@ pub struct GetBalancesResultEntry {
19151915
pub immature: Amount,
19161916
}
19171917

1918-
#[derive(Deserialize, Clone, PartialEq, Eq, Debug)]
1918+
#[derive(Deserialize, Clone, PartialEq, Eq, Debug, Serialize)]
19191919
#[serde(rename_all = "camelCase")]
19201920
pub struct GetBalancesResult {
19211921
pub mine: GetBalancesResultEntry,
@@ -1929,7 +1929,7 @@ impl FundRawTransactionResult {
19291929
}
19301930

19311931
// Used for signrawtransaction argument.
1932-
#[derive(Serialize, Clone, PartialEq, Debug)]
1932+
#[derive(Serialize, Clone, PartialEq, Debug, Deserialize)]
19331933
#[serde(rename_all = "camelCase")]
19341934
pub struct SignRawTransactionInput {
19351935
pub txid: bitcoin::Txid,
@@ -1946,7 +1946,7 @@ pub struct SignRawTransactionInput {
19461946
}
19471947

19481948
/// Used to represent UTXO set hash type
1949-
#[derive(Clone, Serialize, PartialEq, Eq, Debug)]
1949+
#[derive(Clone, Serialize, PartialEq, Eq, Debug, Deserialize)]
19501950
#[serde(rename_all = "snake_case")]
19511951
pub enum TxOutSetHashType {
19521952
HashSerialized2,
@@ -1955,7 +1955,7 @@ pub enum TxOutSetHashType {
19551955
}
19561956

19571957
/// Used to specify a block hash or a height
1958-
#[derive(Clone, Serialize, PartialEq, Eq, Debug)]
1958+
#[derive(Clone, Serialize, PartialEq, Eq, Debug, Deserialize)]
19591959
#[serde(untagged)]
19601960
pub enum HashOrHeight {
19611961
BlockHash(bitcoin::BlockHash),

0 commit comments

Comments
 (0)