Skip to content

Commit

Permalink
Merge #356: Support multiple warnings in RPC responses
Browse files Browse the repository at this point in the history
e03cd64 Support multiple warnings in RPC responses (Roman Zeyde)

Pull request description:

  Following #353.

  Tested on latest bitcoind (bitcoin/bitcoin@2cedb42) with latest electrs (romanz/electrs@7773c26).

ACKs for top commit:
  apoelstra:
    ACK e03cd64 neat! that was easy

Tree-SHA512: df9c038f8e1ccac54a07ad13c7ed87f3a92909c20128fcb598b9891d59127a289bbaf79f9a505d9c87347ffd79dc2aaa063ad750126dbd95a916541d032f4106
  • Loading branch information
apoelstra committed May 11, 2024
2 parents 95d035b + e03cd64 commit 0cdbc25
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions json/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ pub struct GetNetworkInfoResult {
pub incremental_fee: Amount,
#[serde(rename = "localaddresses")]
pub local_addresses: Vec<GetNetworkInfoResultAddress>,
pub warnings: String,
pub warnings: StringOrStringArray,
}

#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
Expand Down Expand Up @@ -517,7 +517,7 @@ pub struct GetMiningInfoResult {
pub pooled_tx: usize,
#[serde(deserialize_with = "deserialize_bip70_network")]
pub chain: Network,
pub warnings: String,
pub warnings: StringOrStringArray,
}

#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
Expand Down Expand Up @@ -1005,7 +1005,7 @@ pub struct GetAddressInfoResult {
}

/// Used to represent values that can either be a string or a string array.
#[derive(Clone, Debug, Deserialize, Serialize)]
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
#[serde(untagged)]
pub enum StringOrStringArray {
String(String),
Expand Down

0 comments on commit 0cdbc25

Please sign in to comment.