From d63837109cb651a24dd5186d63dec790d40bbded Mon Sep 17 00:00:00 2001 From: ffranr Date: Thu, 8 May 2025 00:36:26 +0100 Subject: [PATCH] perms: move perms.go into poolrpc This change narrows the import scope for lightning-node-connect (LNC). Instead of importing the entire pool package, LNC now only needs to import poolrpc. It also brings pool in line with the structure used in our other projects. --- {perms => poolrpc}/perms.go | 2 +- server.go | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) rename {perms => poolrpc}/perms.go (99%) diff --git a/perms/perms.go b/poolrpc/perms.go similarity index 99% rename from perms/perms.go rename to poolrpc/perms.go index 9d2fb57..3cdb1b2 100644 --- a/perms/perms.go +++ b/poolrpc/perms.go @@ -1,4 +1,4 @@ -package perms +package poolrpc import "gopkg.in/macaroon-bakery.v2/bakery" diff --git a/server.go b/server.go index 49fa050..566326e 100644 --- a/server.go +++ b/server.go @@ -24,7 +24,6 @@ import ( "github.com/lightninglabs/pool/clientdb" "github.com/lightninglabs/pool/funding" "github.com/lightninglabs/pool/order" - "github.com/lightninglabs/pool/perms" "github.com/lightninglabs/pool/poolrpc" "github.com/lightninglabs/pool/terms" "github.com/lightningnetwork/lnd/kvdb" @@ -199,7 +198,7 @@ func (s *Server) Start() error { Checkers: []macaroons.Checker{ macaroons.IPLockChecker, }, - RequiredPerms: perms.RequiredPermissions, + RequiredPerms: poolrpc.RequiredPermissions, DBPassword: macDbDefaultPw, LndClient: &s.lndServices.LndServices, EphemeralKey: lndclient.SharedKeyNUMS, @@ -425,7 +424,7 @@ func (s *Server) StartAsSubserver(lndClient lnrpc.LightningClient, Checkers: []macaroons.Checker{ macaroons.IPLockChecker, }, - RequiredPerms: perms.RequiredPermissions, + RequiredPerms: poolrpc.RequiredPermissions, DBPassword: macDbDefaultPw, LndClient: &s.lndServices.LndServices, EphemeralKey: lndclient.SharedKeyNUMS,