From 6d43f9ae193975b4a2441a5c1cd175be26819d70 Mon Sep 17 00:00:00 2001 From: Jeremy Klein Date: Fri, 1 Dec 2023 16:13:26 -0800 Subject: [PATCH] Fix the merge conflicts --- .../objects/account_to_nodes_connection.rs | 4 +-- .../account_to_payment_requests_connection.rs | 9 +------ .../account_to_transactions_connection.rs | 7 ++--- lightspark/src/objects/invoice_data.rs | 12 +-------- lightspark/src/objects/lightspark_node.rs | 13 +++------- .../src/objects/lightspark_node_with_o_s_k.rs | 26 +++++++------------ .../lightspark_node_with_remote_signing.rs | 23 +++++++--------- lightspark/src/objects/outgoing_payment.rs | 21 +++++++-------- .../wallet_to_payment_requests_connection.rs | 9 +------ .../wallet_to_transactions_connection.rs | 5 +--- 10 files changed, 39 insertions(+), 90 deletions(-) diff --git a/lightspark/src/objects/account_to_nodes_connection.rs b/lightspark/src/objects/account_to_nodes_connection.rs index b37edf3..7311782 100644 --- a/lightspark/src/objects/account_to_nodes_connection.rs +++ b/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::connection::Connection; 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)] diff --git a/lightspark/src/objects/account_to_payment_requests_connection.rs b/lightspark/src/objects/account_to_payment_requests_connection.rs index ce6fcea..6326302 100644 --- a/lightspark/src/objects/account_to_payment_requests_connection.rs +++ b/lightspark/src/objects/account_to_payment_requests_connection.rs @@ -1,16 +1,9 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved -<<<<<<< Updated upstream -use serde::{Deserialize, Serialize}; - -use crate::objects::connection::Connection; -use crate::objects::page_info::PageInfo; -use crate::objects::payment_request::PaymentRequestEnum; -======= use crate::objects::connection::Connection; use crate::objects::page_info::PageInfo; use crate::objects::payment_request::PaymentRequestEnum; use serde::{Deserialize, Serialize}; ->>>>>>> Stashed changes + use std::vec::Vec; #[derive(Debug, Clone, Deserialize, Serialize)] diff --git a/lightspark/src/objects/account_to_transactions_connection.rs b/lightspark/src/objects/account_to_transactions_connection.rs index d366bb5..00825e4 100644 --- a/lightspark/src/objects/account_to_transactions_connection.rs +++ b/lightspark/src/objects/account_to_transactions_connection.rs @@ -1,13 +1,10 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved -use crate::objects::transaction::TransactionEnum; +use crate::objects::connection::Connection; use serde::{Deserialize, Serialize}; -<<<<<<< Updated upstream -use crate::objects::connection::Connection; use crate::objects::currency_amount::CurrencyAmount; use crate::objects::page_info::PageInfo; -======= ->>>>>>> Stashed changes +use crate::objects::transaction::TransactionEnum; use std::vec::Vec; #[derive(Debug, Clone, Deserialize, Serialize)] diff --git a/lightspark/src/objects/invoice_data.rs b/lightspark/src/objects/invoice_data.rs index c80798b..dd95c64 100644 --- a/lightspark/src/objects/invoice_data.rs +++ b/lightspark/src/objects/invoice_data.rs @@ -1,21 +1,11 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved -<<<<<<< Updated upstream -use crate::objects::payment_request_data::PaymentRequestData; +use crate::objects::node::NodeEnum; 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::bitcoin_network::BitcoinNetwork; -use crate::objects::currency_amount::CurrencyAmount; -use crate::types::custom_date_formats::custom_date_format; -use serde::{Deserialize, Serialize}; - -use crate::objects::node::NodeEnum; use crate::objects::payment_request_data::PaymentRequestData; ->>>>>>> Stashed changes 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. diff --git a/lightspark/src/objects/lightspark_node.rs b/lightspark/src/objects/lightspark_node.rs index 9976f09..07adf47 100644 --- a/lightspark/src/objects/lightspark_node.rs +++ b/lightspark/src/objects/lightspark_node.rs @@ -1,23 +1,16 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved +use crate::objects::blockchain_balance::BlockchainBalance; use crate::objects::entity::Entity; +use crate::objects::lightspark_node_status::LightsparkNodeStatus; use crate::objects::node::Node; use super::lightspark_node_with_o_s_k::LightsparkNodeWithOSK; -use crate::objects::currency_amount::CurrencyAmount; -use crate::objects::entity::Entity; -use crate::objects::node::Node; -use serde_json::Value; - use super::lightspark_node_with_remote_signing::LightsparkNodeWithRemoteSigning; use crate::objects::balances::Balances; -use crate::objects::blockchain_balance::BlockchainBalance; -<<<<<<< Updated upstream use crate::objects::currency_amount::CurrencyAmount; -======= ->>>>>>> Stashed changes -use crate::objects::lightspark_node_status::LightsparkNodeStatus; use crate::types::entity_wrapper::EntityWrapper; use serde::{Deserialize, Deserializer, Serialize}; +use serde_json::Value; use std::vec::Vec; pub trait LightsparkNode: Node + Entity { diff --git a/lightspark/src/objects/lightspark_node_with_o_s_k.rs b/lightspark/src/objects/lightspark_node_with_o_s_k.rs index 3ceae7f..2b33c84 100644 --- a/lightspark/src/objects/lightspark_node_with_o_s_k.rs +++ b/lightspark/src/objects/lightspark_node_with_o_s_k.rs @@ -1,35 +1,27 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved +use crate::objects::currency_amount::CurrencyAmount; +use crate::objects::entity::Entity; +use crate::objects::lightspark_node::LightsparkNode; +use crate::objects::node_address_type::NodeAddressType; +use crate::types::entity_wrapper::EntityWrapper; +use serde::{Deserialize, Serialize}; +use std::collections::HashMap; + use crate::error::Error; use crate::objects::balances::Balances; -<<<<<<< Updated upstream -======= use crate::objects::bitcoin_network::BitcoinNetwork; ->>>>>>> Stashed changes use crate::objects::blockchain_balance::BlockchainBalance; use crate::objects::channel_status::ChannelStatus; -use crate::objects::currency_amount::CurrencyAmount; -use crate::objects::lightspark_node::LightsparkNode; use crate::objects::lightspark_node_status::LightsparkNodeStatus; use crate::objects::lightspark_node_to_channels_connection::LightsparkNodeToChannelsConnection; use crate::objects::node::Node; use crate::objects::node_to_addresses_connection::NodeToAddressesConnection; use crate::objects::secret::Secret; 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 crate::objects::entity::Entity; -use crate::types::graphql_requester::GraphQLRequester; -use std::collections::HashMap; -use std::vec::Vec; - -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. diff --git a/lightspark/src/objects/lightspark_node_with_remote_signing.rs b/lightspark/src/objects/lightspark_node_with_remote_signing.rs index e889908..a163d8c 100644 --- a/lightspark/src/objects/lightspark_node_with_remote_signing.rs +++ b/lightspark/src/objects/lightspark_node_with_remote_signing.rs @@ -1,29 +1,26 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved +use crate::objects::currency_amount::CurrencyAmount; +use crate::objects::entity::Entity; +use crate::objects::lightspark_node::LightsparkNode; +use crate::objects::node_address_type::NodeAddressType; +use crate::types::entity_wrapper::EntityWrapper; +use serde::{Deserialize, Serialize}; +use std::collections::HashMap; + 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::lightspark_node::LightsparkNode; use crate::objects::lightspark_node_status::LightsparkNodeStatus; use crate::objects::lightspark_node_to_channels_connection::LightsparkNodeToChannelsConnection; use crate::objects::node::Node; +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 crate::objects::entity::Entity; -use crate::types::graphql_requester::GraphQLRequester; -use std::collections::HashMap; -use std::vec::Vec; - -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. diff --git a/lightspark/src/objects/outgoing_payment.rs b/lightspark/src/objects/outgoing_payment.rs index ed832c7..2f366ae 100644 --- a/lightspark/src/objects/outgoing_payment.rs +++ b/lightspark/src/objects/outgoing_payment.rs @@ -1,28 +1,25 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved -<<<<<<< Updated upstream -======= -use crate::objects::lightning_transaction::LightningTransaction; ->>>>>>> Stashed changes -use serde::{Deserialize, Serialize}; - -use crate::error::Error; use crate::objects::currency_amount::CurrencyAmount; use crate::objects::entity::Entity; use crate::objects::outgoing_payment_to_attempts_connection::OutgoingPaymentToAttemptsConnection; -use crate::objects::payment_failure_reason::PaymentFailureReason; use crate::objects::payment_request_data::PaymentRequestDataEnum; use crate::objects::post_transaction_data::PostTransactionData; +use crate::objects::transaction_status::TransactionStatus; +use crate::types::entity_wrapper::EntityWrapper; +use serde::{Deserialize, Serialize}; +use serde_json::Value; +use std::collections::HashMap; + +use crate::error::Error; +use crate::objects::lightning_transaction::LightningTransaction; +use crate::objects::payment_failure_reason::PaymentFailureReason; 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. diff --git a/lightspark/src/objects/wallet_to_payment_requests_connection.rs b/lightspark/src/objects/wallet_to_payment_requests_connection.rs index 502a982..19aba9c 100644 --- a/lightspark/src/objects/wallet_to_payment_requests_connection.rs +++ b/lightspark/src/objects/wallet_to_payment_requests_connection.rs @@ -1,16 +1,9 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved -<<<<<<< Updated upstream -use serde::{Deserialize, Serialize}; - -use crate::objects::connection::Connection; -use crate::objects::page_info::PageInfo; -use crate::objects::payment_request::PaymentRequestEnum; -======= use crate::objects::connection::Connection; use crate::objects::page_info::PageInfo; use crate::objects::payment_request::PaymentRequestEnum; use serde::{Deserialize, Serialize}; ->>>>>>> Stashed changes + use std::vec::Vec; #[derive(Debug, Clone, Deserialize, Serialize)] diff --git a/lightspark/src/objects/wallet_to_transactions_connection.rs b/lightspark/src/objects/wallet_to_transactions_connection.rs index b96a2c0..04f04c9 100644 --- a/lightspark/src/objects/wallet_to_transactions_connection.rs +++ b/lightspark/src/objects/wallet_to_transactions_connection.rs @@ -1,12 +1,9 @@ // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved use crate::objects::connection::Connection; -use crate::objects::transaction::TransactionEnum; use serde::{Deserialize, Serialize}; -<<<<<<< Updated upstream use crate::objects::page_info::PageInfo; -======= ->>>>>>> Stashed changes +use crate::objects::transaction::TransactionEnum; use std::vec::Vec; #[derive(Debug, Clone, Deserialize, Serialize)]