From 85c50c4b9b606b99889661e0e78ac64dabb82456 Mon Sep 17 00:00:00 2001
From: Michael Bumann <hello@michaelbumann.com>
Date: Tue, 12 Feb 2019 06:54:47 +0100
Subject: [PATCH] Add shortcut support for non convention requests

---
 lib/lnrpc/client.rb | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/lib/lnrpc/client.rb b/lib/lnrpc/client.rb
index d713d0e..a17a415 100644
--- a/lib/lnrpc/client.rb
+++ b/lib/lnrpc/client.rb
@@ -7,6 +7,25 @@ module Lnrpc
     DEFAULT_CREDENTIALS_PATH = "#{LND_HOME_DIR}/tls.cert"
     DEFAULT_MACAROON_PATH = "#{LND_HOME_DIR}/data/chain/bitcoin/mainnet/admin.macaroon"
 
+    NON_CONVENTION_REQUEST_CLASSES = {
+      add_invoice: Lnrpc::Invoice,
+      send_payment: Lnrpc::SendRequest,
+      send_payment_sync: Lnrpc::SendRequest,
+      open_channel_sync: Lnrpc::OpenChannelRequest,
+      send_to_route_sync: Lnrpc::SendToRouteRequest,
+      lookup_invoice: Lnrpc::PaymentHash,
+      decode_pay_req: Lnrpc::PayReqString,
+      describe_graph: Lnrpc::ChannelGraphRequest,
+      get_chan_info: Lnrpc::ChanInfoRequest,
+      get_node_info: Lnrpc::NodeInfoRequest,
+      get_network_info: Lnrpc::NetworkInfoRequest,
+      stop_daemon: Lnrpc::StopRequest,
+      update_channel_policy: Lnrpc::PolicyUpdateResponse,
+      subscribe_channel_graph: Lnrpc::GraphTopologySubscription,
+      subscribe_invoices: Lnrpc::InvoiceSubscription,
+      subscribe_transactions: Lnrpc::GetTransactionsRequest
+    }
+
     def initialize(options={})
       self.address = options[:address] || DEFAULT_ADDRESS
 
@@ -40,9 +59,13 @@ module Lnrpc
 
     private
     def request_class_for(method_name)
-      string = method_name.to_s.sub(/^[a-z\d]*/) { |match| match.capitalize }
-      string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
-      Lnrpc.const_get("#{string}Request")
+      if NON_CONVENTION_REQUEST_CLASSES.key?(method_name.to_sym)
+        NON_CONVENTION_REQUEST_CLASSES[method_name.to_sym]
+      else
+        klass = method_name.to_s.sub(/^[a-z\d]*/) { |match| match.capitalize }
+        klass.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
+        Lnrpc.const_get("#{klass}Request")
+      end
     end
   end
 end