Merge pull request #21 from lightsparkdev/feat/cancelinvoice

Add a cancel_invoice function.

lightspark/src/client.rs

@@ -393,6 +393,40 @@ impl<K: OperationSigningKey> LightsparkClient<K> {
         Ok(result)
     }
 
+    /// Cancels an existing unpaid invoice and returns that invoice. Cancelled invoices cannot be paid.
+    pub async fn cancel_invoice(&self, invoice_id: &str) -> Result<Invoice, Error> {
+        let operation = format!(
+            "mutation CancelInvoice(
+                $invoice_id: ID!
+            ) {{
+                cancel_invoice(input: {{
+                    invoice_id: $invoice_id
+                }}) {{
+                    invoice {{
+                        ...InvoiceFragment
+                    }}
+                }}
+            }}
+
+            {}
+            ",
+            invoice::FRAGMENT
+        );
+
+        let mut variables: HashMap<&str, Value> = HashMap::new();
+        variables.insert("invoice_id", invoice_id.into());
+
+        let value = serde_json::to_value(variables).map_err(Error::ConversionError)?;
+        let json = self
+            .requester
+            .execute_graphql(&operation, Some(value))
+            .await?;
+
+        let result = serde_json::from_value(json["cancel_invoice"]["invoice"].clone())
+            .map_err(Error::JsonError)?;
+        Ok(result)
+    }
+
     pub async fn fund_node(
         &self,
         node_id: &str,

lightspark/src/objects/account_to_nodes_connection.rs

@@ -1,10 +1,10 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 use crate::objects::connection::Connection;
 use serde::{Deserialize, Serialize};
+use std::vec::Vec;
 
 use crate::objects::lightspark_node::LightsparkNodeEnum;
 use crate::objects::page_info::PageInfo;
-use std::vec::Vec;
 
 /// A connection between an account and the nodes it manages.
 #[derive(Debug, Clone, Deserialize, Serialize)]

lightspark/src/objects/account_to_payment_requests_connection.rs

@@ -1,9 +1,9 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
-use crate::objects::connection::Connection;
-use crate::objects::payment_request::PaymentRequestEnum;
 use serde::{Deserialize, Serialize};
 
+use crate::objects::connection::Connection;
 use crate::objects::page_info::PageInfo;
+use crate::objects::payment_request::PaymentRequestEnum;
 use std::vec::Vec;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]

lightspark/src/objects/account_to_transactions_connection.rs

@@ -1,10 +1,10 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
-use crate::objects::connection::Connection;
-use crate::objects::currency_amount::CurrencyAmount;
-use crate::objects::page_info::PageInfo;
 use crate::objects::transaction::TransactionEnum;
 use serde::{Deserialize, Serialize};
 
+use crate::objects::connection::Connection;
+use crate::objects::currency_amount::CurrencyAmount;
+use crate::objects::page_info::PageInfo;
 use std::vec::Vec;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]

lightspark/src/objects/cancel_invoice_input.rs

@@ -0,0 +1,7 @@
+// Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct CancelInvoiceInput {
+    pub invoice_id: String,
+}

lightspark/src/objects/cancel_invoice_output.rs

@@ -0,0 +1,18 @@
+// Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
+use crate::types::entity_wrapper::EntityWrapper;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct CancelInvoiceOutput {
+    #[serde(rename = "cancel_invoice_output_invoice")]
+    pub invoice: EntityWrapper,
+}
+
+pub const FRAGMENT: &str = "
+fragment CancelInvoiceOutputFragment on CancelInvoiceOutput {
+    __typename
+    cancel_invoice_output_invoice: invoice {
+        id
+    }
+}
+";

lightspark/src/objects/invoice_data.rs

@@ -1,11 +1,11 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
-use crate::objects::currency_amount::CurrencyAmount;
+use crate::objects::payment_request_data::PaymentRequestData;
+use crate::types::custom_date_formats::custom_date_format;
 use serde::{Deserialize, Serialize};
 
 use crate::objects::bitcoin_network::BitcoinNetwork;
+use crate::objects::currency_amount::CurrencyAmount;
 use crate::objects::node::NodeEnum;
-use crate::objects::payment_request_data::PaymentRequestData;
-use crate::types::custom_date_formats::custom_date_format;
 use chrono::{DateTime, Utc};
 
 /// This object represents the data associated with a BOLT #11 invoice. You can retrieve this object to receive the relevant data associated with a specific invoice.

lightspark/src/objects/lightspark_node.rs

@@ -1,12 +1,13 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
+use crate::objects::entity::Entity;
+use crate::objects::node::Node;
+
 use super::lightspark_node_with_o_s_k::LightsparkNodeWithOSK;
 use super::lightspark_node_with_remote_signing::LightsparkNodeWithRemoteSigning;
 use crate::objects::balances::Balances;
 use crate::objects::blockchain_balance::BlockchainBalance;
 use crate::objects::currency_amount::CurrencyAmount;
-use crate::objects::entity::Entity;
 use crate::objects::lightspark_node_status::LightsparkNodeStatus;
-use crate::objects::node::Node;
 use crate::types::entity_wrapper::EntityWrapper;
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::Value;

lightspark/src/objects/lightspark_node_with_o_s_k.rs

@@ -1,29 +1,29 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
-use crate::objects::blockchain_balance::BlockchainBalance;
-use crate::objects::channel_status::ChannelStatus;
-use crate::objects::lightspark_node_status::LightsparkNodeStatus;
-use crate::objects::secret::Secret;
-use serde::{Deserialize, Serialize};
-use std::vec::Vec;
-
 use crate::error::Error;
 use crate::objects::balances::Balances;
-use crate::objects::bitcoin_network::BitcoinNetwork;
+use crate::objects::blockchain_balance::BlockchainBalance;
+use crate::objects::channel_status::ChannelStatus;
 use crate::objects::currency_amount::CurrencyAmount;
 use crate::objects::entity::Entity;
 use crate::objects::lightspark_node::LightsparkNode;
 use crate::objects::lightspark_node_to_channels_connection::LightsparkNodeToChannelsConnection;
 use crate::objects::node::Node;
-use crate::objects::node_address_type::NodeAddressType;
 use crate::objects::node_to_addresses_connection::NodeToAddressesConnection;
 use crate::types::custom_date_formats::custom_date_format;
 use crate::types::entity_wrapper::EntityWrapper;
 use crate::types::get_entity::GetEntity;
 use crate::types::graphql_requester::GraphQLRequester;
 use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 
+use crate::objects::bitcoin_network::BitcoinNetwork;
+use crate::objects::lightspark_node_status::LightsparkNodeStatus;
+use crate::objects::node_address_type::NodeAddressType;
+use crate::objects::secret::Secret;
+use std::vec::Vec;
+
 /// This is a Lightspark node with OSK.
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct LightsparkNodeWithOSK {

lightspark/src/objects/lightspark_node_with_remote_signing.rs

@@ -1,28 +1,28 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
-use crate::objects::blockchain_balance::BlockchainBalance;
-use crate::objects::channel_status::ChannelStatus;
-use crate::objects::lightspark_node_status::LightsparkNodeStatus;
-use serde::{Deserialize, Serialize};
-use std::vec::Vec;
-
 use crate::error::Error;
 use crate::objects::balances::Balances;
 use crate::objects::bitcoin_network::BitcoinNetwork;
+use crate::objects::blockchain_balance::BlockchainBalance;
+use crate::objects::channel_status::ChannelStatus;
 use crate::objects::currency_amount::CurrencyAmount;
 use crate::objects::entity::Entity;
 use crate::objects::lightspark_node::LightsparkNode;
 use crate::objects::lightspark_node_to_channels_connection::LightsparkNodeToChannelsConnection;
 use crate::objects::node::Node;
-use crate::objects::node_address_type::NodeAddressType;
-use crate::objects::node_to_addresses_connection::NodeToAddressesConnection;
 use crate::types::custom_date_formats::custom_date_format;
 use crate::types::entity_wrapper::EntityWrapper;
 use crate::types::get_entity::GetEntity;
 use crate::types::graphql_requester::GraphQLRequester;
 use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::collections::HashMap;
 
+use crate::objects::lightspark_node_status::LightsparkNodeStatus;
+use crate::objects::node_address_type::NodeAddressType;
+use crate::objects::node_to_addresses_connection::NodeToAddressesConnection;
+use std::vec::Vec;
+
 /// This is a Lightspark node with remote signing.
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct LightsparkNodeWithRemoteSigning {

lightspark/src/objects/mod.rs

@@ -11,6 +11,8 @@ pub mod api_token;
 pub mod balances;
 pub mod bitcoin_network;
 pub mod blockchain_balance;
+pub mod cancel_invoice_input;
+pub mod cancel_invoice_output;
 pub mod channel;
 pub mod channel_closing_transaction;
 pub mod channel_fees;

lightspark/src/objects/outgoing_payment.rs

@@ -1,10 +1,5 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
-use crate::objects::transaction_status::TransactionStatus;
-use crate::types::custom_date_formats::custom_date_format;
-use crate::types::custom_date_formats::custom_date_format_option;
 use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::vec::Vec;
 
 use crate::error::Error;
 use crate::objects::currency_amount::CurrencyAmount;
@@ -16,11 +11,16 @@ use crate::objects::payment_request_data::PaymentRequestDataEnum;
 use crate::objects::post_transaction_data::PostTransactionData;
 use crate::objects::rich_text::RichText;
 use crate::objects::transaction::Transaction;
+use crate::objects::transaction_status::TransactionStatus;
+use crate::types::custom_date_formats::custom_date_format;
+use crate::types::custom_date_formats::custom_date_format_option;
 use crate::types::entity_wrapper::EntityWrapper;
 use crate::types::get_entity::GetEntity;
 use crate::types::graphql_requester::GraphQLRequester;
 use chrono::{DateTime, Utc};
+use serde_json::Value;
 use std::collections::HashMap;
+use std::vec::Vec;
 
 /// This object represents a Lightning Network payment sent from a Lightspark Node. You can retrieve this object to receive payment related information about any payment sent from your Lightspark Node on the Lightning Network.
 #[derive(Debug, Clone, Deserialize, Serialize)]

lightspark/src/objects/wallet_to_payment_requests_connection.rs

@@ -1,9 +1,9 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
-use crate::objects::connection::Connection;
-use crate::objects::payment_request::PaymentRequestEnum;
 use serde::{Deserialize, Serialize};
 
+use crate::objects::connection::Connection;
 use crate::objects::page_info::PageInfo;
+use crate::objects::payment_request::PaymentRequestEnum;
 use std::vec::Vec;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]

lightspark/src/objects/wallet_to_transactions_connection.rs

@@ -1,9 +1,9 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 use crate::objects::connection::Connection;
-use crate::objects::page_info::PageInfo;
 use crate::objects::transaction::TransactionEnum;
 use serde::{Deserialize, Serialize};
 
+use crate::objects::page_info::PageInfo;
 use std::vec::Vec;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]