From edfd3eb2fd5592f86e650fbbd46f968d2f6b0a4d Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Tue, 3 Jan 2023 13:52:31 -0800 Subject: [PATCH 1/2] Derive Deserialize on ImportDescriptors --- json/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/src/lib.rs b/json/src/lib.rs index 56379110..611075f4 100644 --- a/json/src/lib.rs +++ b/json/src/lib.rs @@ -1254,7 +1254,7 @@ pub struct ImportMultiResult { } /// A import request for importdescriptors. -#[derive(Clone, PartialEq, Eq, Debug, Default, Serialize)] +#[derive(Clone, PartialEq, Eq, Debug, Default, Deserialize, Serialize)] pub struct ImportDescriptors<'a> { #[serde(rename = "desc")] pub descriptor: &'a str, From df2ab9952c7071beda5d2ad634ae14ea2a17b0d4 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Tue, 3 Jan 2023 13:57:19 -0800 Subject: [PATCH 2/2] Remove lifetime --- json/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/json/src/lib.rs b/json/src/lib.rs index 611075f4..db05f86e 100644 --- a/json/src/lib.rs +++ b/json/src/lib.rs @@ -1255,9 +1255,9 @@ pub struct ImportMultiResult { /// A import request for importdescriptors. #[derive(Clone, PartialEq, Eq, Debug, Default, Deserialize, Serialize)] -pub struct ImportDescriptors<'a> { +pub struct ImportDescriptors { #[serde(rename = "desc")] - pub descriptor: &'a str, + pub descriptor: String, pub timestamp: Timestamp, #[serde(skip_serializing_if = "Option::is_none")] pub active: Option, @@ -1268,7 +1268,7 @@ pub struct ImportDescriptors<'a> { #[serde(skip_serializing_if = "Option::is_none")] pub internal: Option, #[serde(skip_serializing_if = "Option::is_none")] - pub label: Option<&'a str>, + pub label: Option, } /// Progress toward rejecting pre-softfork blocks