Skip to content

Commit 8cccc5f

Browse files
committed
Merge #273: Derive Deserialize on ImportDescriptors
df2ab99 Remove lifetime (Casey Rodarmor) edfd3eb Derive Deserialize on ImportDescriptors (Casey Rodarmor) Pull request description: We wound up needing `Deserialize` on `ImportDescriptors` for our mock Bitcoin Core RPC server. ACKs for top commit: apoelstra: ACK df2ab99 Tree-SHA512: 560e4eacad8c410c80cb28a89c8c0346be3864a97545ac2d274a76d21472dc045b03f1fdb328a657757b923c8a7fec512699a2f354a6f8f8019efd71abd6fb18
2 parents 13256b0 + df2ab99 commit 8cccc5f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

json/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1254,10 +1254,10 @@ pub struct ImportMultiResult {
12541254
}
12551255

12561256
/// A import request for importdescriptors.
1257-
#[derive(Clone, PartialEq, Eq, Debug, Default, Serialize)]
1258-
pub struct ImportDescriptors<'a> {
1257+
#[derive(Clone, PartialEq, Eq, Debug, Default, Deserialize, Serialize)]
1258+
pub struct ImportDescriptors {
12591259
#[serde(rename = "desc")]
1260-
pub descriptor: &'a str,
1260+
pub descriptor: String,
12611261
pub timestamp: Timestamp,
12621262
#[serde(skip_serializing_if = "Option::is_none")]
12631263
pub active: Option<bool>,
@@ -1268,7 +1268,7 @@ pub struct ImportDescriptors<'a> {
12681268
#[serde(skip_serializing_if = "Option::is_none")]
12691269
pub internal: Option<bool>,
12701270
#[serde(skip_serializing_if = "Option::is_none")]
1271-
pub label: Option<&'a str>,
1271+
pub label: Option<String>,
12721272
}
12731273

12741274
/// Progress toward rejecting pre-softfork blocks

0 commit comments

Comments
 (0)