Fix macaroon permissions and rename WtClientClient

WtClientClient renamed to WatchtowerClientClient in order to make
macaroon permission code play nice.
Change macaroon permission code to allow for Services with "Client"
in the name.

Author: Jontified

macaroon_recipes.go

@@ -21,7 +21,7 @@ var (
 		"signrpc":     (*SignerClient)(nil),
 		"verrpc":      (*VersionerClient)(nil),
 		"walletrpc":   (*WalletKitClient)(nil),
-		"wtclientrpc": (*WtClientClient)(nil),
+		"wtclientrpc": (*WatchtowerClientClient)(nil),
 	}
 
 	// renames is a map of renamed RPC method names. The key is the name as
@@ -55,6 +55,15 @@ var (
 	}
 )
 
+func replaceRight(s, old, new string) string {
+	i := strings.LastIndex(s, old)
+	if i == -1 {
+		return s
+	}
+
+	return s[:i] + new + s[i+len(old):]
+}
+
 // MacaroonRecipe returns a list of macaroon permissions that is required to use
 // the full feature set of the given list of RPC package names.
 func MacaroonRecipe(c LightningClient, packages []string) ([]MacaroonPermission,
@@ -78,7 +87,7 @@ func MacaroonRecipe(c LightningClient, packages []string) ([]MacaroonPermission,
 		// From the pointer type we can find out the interface, its name
 		// and what methods it declares.
 		ifaceType := reflect.TypeOf(ifacePtr).Elem()
-		serverName := strings.ReplaceAll(ifaceType.Name(), "Client", "")
+		serverName := replaceRight(ifaceType.Name(), "Client", "")
 		for i := range ifaceType.NumMethod() {
 			// The methods in lndclient might be called slightly
 			// differently. Rename according to our rename mapping

wtclient_client.go

@@ -8,7 +8,7 @@ import (
 	"google.golang.org/grpc"
 )
 
-type WtClientClient interface {
+type WatchtowerClientClient interface {
 	ServiceClient[wtclientrpc.WatchtowerClientClient]
 
 	AddTower(ctx context.Context, pubkey []byte, address string) error
@@ -51,7 +51,7 @@ type wtClientClient struct {
 
 // A compile time check to ensure that  wtClientClient implements the
 // WtclientClient interface.
-var _ WtClientClient = (*wtClientClient)(nil)
+var _ WatchtowerClientClient = (*wtClientClient)(nil)
 
 func newWtClientClient(conn grpc.ClientConnInterface,
 	wtClientMac serializedMacaroon, timeout time.Duration) *wtClientClient {