mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-24 14:50:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3262 from cfromknecht/watchtowerrpc-crash-fix

Browse source 
lnrpc/watchtowerrpc: prevent watchtowerrpc panic when tower not active
This commit is contained in:
Conner Fromknecht 2019-07-02 18:07:53 -07:00 • committed by GitHub
commit 5f4922cd57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lnrpc/watchtowerrpc/config_active.go
View file

@ -7,6 +7,9 @@ package watchtowerrpc
// fields with struct tags are meant to parsed as normal configuration options, // fields with struct tags are meant to parsed as normal configuration options,
// while if able to be populated, the latter fields MUST also be specified. // while if able to be populated, the latter fields MUST also be specified.
type Config struct { type Config struct {
// Active indicates if the watchtower is enabled.
Active bool
// Tower is the active watchtower which serves as the primary source for // Tower is the active watchtower which serves as the primary source for
// information presented via RPC. // information presented via RPC.
Tower WatchtowerBackend Tower WatchtowerBackend

2
lnrpc/watchtowerrpc/handler.go
View file

@ -124,7 +124,7 @@ func (c *Handler) GetInfo(ctx context.Context,
// isActive returns nil if the tower backend is initialized, and the Handler can // isActive returns nil if the tower backend is initialized, and the Handler can
// proccess RPC requests. // proccess RPC requests.
func (c *Handler) isActive() error { func (c *Handler) isActive() error {
if c.cfg.Tower != nil { if c.cfg.Active {
return nil return nil
} }
return ErrTowerNotActive return ErrTowerNotActive

3
subrpcserver_config.go
View file

@ -216,6 +216,9 @@ func (s *subRPCServerConfigs) PopulateDependencies(cc *chainControl,
case *watchtowerrpc.Config: case *watchtowerrpc.Config:
subCfgValue := extractReflectValue(subCfg) subCfgValue := extractReflectValue(subCfg)
subCfgValue.FieldByName("Active").Set(
reflect.ValueOf(tower != nil),
)
subCfgValue.FieldByName("Tower").Set( subCfgValue.FieldByName("Tower").Set(
reflect.ValueOf(tower), reflect.ValueOf(tower),
) )