Merge pull request #82 from benthecarman/shared-endpoints

Move endpoint path constants to shared defintion

Author: tnull

ldk-server-client/src/client.rs

@@ -13,26 +13,18 @@ use ldk_server_protos::api::{
 	OnchainReceiveRequest, OnchainReceiveResponse, OnchainSendRequest, OnchainSendResponse,
 	OpenChannelRequest, OpenChannelResponse,
 };
+use ldk_server_protos::endpoints::{
+	BOLT11_RECEIVE_PATH, BOLT11_SEND_PATH, BOLT12_RECEIVE_PATH, BOLT12_SEND_PATH,
+	CLOSE_CHANNEL_PATH, FORCE_CLOSE_CHANNEL_PATH, GET_BALANCES_PATH, GET_NODE_INFO_PATH,
+	LIST_CHANNELS_PATH, LIST_PAYMENTS_PATH, ONCHAIN_RECEIVE_PATH, ONCHAIN_SEND_PATH,
+	OPEN_CHANNEL_PATH,
+};
 use ldk_server_protos::error::{ErrorCode, ErrorResponse};
 use reqwest::header::CONTENT_TYPE;
 use reqwest::Client;
 
 const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";
 
-const GET_NODE_INFO_PATH: &str = "GetNodeInfo";
-const GET_BALANCES_PATH: &str = "GetBalances";
-const ONCHAIN_RECEIVE_PATH: &str = "OnchainReceive";
-const ONCHAIN_SEND_PATH: &str = "OnchainSend";
-const BOLT11_RECEIVE_PATH: &str = "Bolt11Receive";
-const BOLT11_SEND_PATH: &str = "Bolt11Send";
-const BOLT12_RECEIVE_PATH: &str = "Bolt12Receive";
-const BOLT12_SEND_PATH: &str = "Bolt12Send";
-const OPEN_CHANNEL_PATH: &str = "OpenChannel";
-const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
-const FORCE_CLOSE_CHANNEL_PATH: &str = "ForceCloseChannel";
-const LIST_CHANNELS_PATH: &str = "ListChannels";
-const LIST_PAYMENTS_PATH: &str = "ListPayments";
-
 /// Client to access a hosted instance of LDK Server.
 #[derive(Clone)]
 pub struct LdkServerClient {

ldk-server-protos/src/endpoints.rs

@@ -0,0 +1,16 @@
+pub const GET_NODE_INFO_PATH: &str = "GetNodeInfo";
+pub const GET_BALANCES_PATH: &str = "GetBalances";
+pub const ONCHAIN_RECEIVE_PATH: &str = "OnchainReceive";
+pub const ONCHAIN_SEND_PATH: &str = "OnchainSend";
+pub const BOLT11_RECEIVE_PATH: &str = "Bolt11Receive";
+pub const BOLT11_SEND_PATH: &str = "Bolt11Send";
+pub const BOLT12_RECEIVE_PATH: &str = "Bolt12Receive";
+pub const BOLT12_SEND_PATH: &str = "Bolt12Send";
+pub const OPEN_CHANNEL_PATH: &str = "OpenChannel";
+pub const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
+pub const FORCE_CLOSE_CHANNEL_PATH: &str = "ForceCloseChannel";
+pub const LIST_CHANNELS_PATH: &str = "ListChannels";
+pub const LIST_PAYMENTS_PATH: &str = "ListPayments";
+pub const LIST_FORWARDED_PAYMENTS_PATH: &str = "ListForwardedPayments";
+pub const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";
+pub const GET_PAYMENT_DETAILS_PATH: &str = "GetPaymentDetails";

ldk-server-protos/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod api;
+pub mod endpoints;
 pub mod error;
 pub mod events;
 pub mod types;

ldk-server/src/api/bolt11_receive.rs

@@ -3,8 +3,6 @@ use crate::service::Context;
 use crate::util::proto_adapter::proto_to_bolt11_description;
 use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};
 
-pub(crate) const BOLT11_RECEIVE_PATH: &str = "Bolt11Receive";
-
 pub(crate) fn handle_bolt11_receive_request(
 	context: Context, request: Bolt11ReceiveRequest,
 ) -> Result<Bolt11ReceiveResponse, LdkServerError> {

ldk-server/src/api/bolt11_send.rs

@@ -4,8 +4,6 @@ use ldk_node::lightning_invoice::Bolt11Invoice;
 use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
 use std::str::FromStr;
 
-pub(crate) const BOLT11_SEND_PATH: &str = "Bolt11Send";
-
 pub(crate) fn handle_bolt11_send_request(
 	context: Context, request: Bolt11SendRequest,
 ) -> Result<Bolt11SendResponse, LdkServerError> {

ldk-server/src/api/bolt12_receive.rs

@@ -2,8 +2,6 @@ use crate::api::error::LdkServerError;
 use crate::service::Context;
 use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};
 
-pub(crate) const BOLT12_RECEIVE_PATH: &str = "Bolt12Receive";
-
 pub(crate) fn handle_bolt12_receive_request(
 	context: Context, request: Bolt12ReceiveRequest,
 ) -> Result<Bolt12ReceiveResponse, LdkServerError> {

ldk-server/src/api/bolt12_send.rs

@@ -4,8 +4,6 @@ use ldk_node::lightning::offers::offer::Offer;
 use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
 use std::str::FromStr;
 
-pub(crate) const BOLT12_SEND_PATH: &str = "Bolt12Send";
-
 pub(crate) fn handle_bolt12_send_request(
 	context: Context, request: Bolt12SendRequest,
 ) -> Result<Bolt12SendResponse, LdkServerError> {

ldk-server/src/api/close_channel.rs

@@ -8,8 +8,6 @@ use ldk_server_protos::api::{
 };
 use std::str::FromStr;
 
-pub(crate) const CLOSE_CHANNEL_PATH: &str = "CloseChannel";
-
 pub(crate) fn handle_close_channel_request(
 	context: Context, request: CloseChannelRequest,
 ) -> Result<CloseChannelResponse, LdkServerError> {
@@ -21,8 +19,6 @@ pub(crate) fn handle_close_channel_request(
 	Ok(CloseChannelResponse {})
 }
 
-pub(crate) const FORCE_CLOSE_CHANNEL_PATH: &str = "ForceCloseChannel";
-
 pub(crate) fn handle_force_close_channel_request(
 	context: Context, request: ForceCloseChannelRequest,
 ) -> Result<ForceCloseChannelResponse, LdkServerError> {

ldk-server/src/api/get_balances.rs

@@ -3,8 +3,6 @@ use crate::service::Context;
 use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
 use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};
 
-pub(crate) const GET_BALANCES: &str = "GetBalances";
-
 pub(crate) fn handle_get_balances_request(
 	context: Context, _request: GetBalancesRequest,
 ) -> Result<GetBalancesResponse, LdkServerError> {

ldk-server/src/api/get_node_info.rs

@@ -3,8 +3,6 @@ use crate::service::Context;
 use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
 use ldk_server_protos::types::BestBlock;
 
-pub(crate) const GET_NODE_INFO: &str = "GetNodeInfo";
-
 pub(crate) fn handle_get_node_info_request(
 	context: Context, _request: GetNodeInfoRequest,
 ) -> Result<GetNodeInfoResponse, LdkServerError> {