From 4a3980353dcb9fb9d36752211dfef901e2efaa60 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Wed, 21 Mar 2018 15:46:37 -0700 Subject: [PATCH] lntest: update test node arguments to account for new invoice.macaroon --- lntest/node.go | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/lntest/node.go b/lntest/node.go index 7420a153..0fd0b97d 100644 --- a/lntest/node.go +++ b/lntest/node.go @@ -90,15 +90,17 @@ type nodeConfig struct { BaseDir string ExtraArgs []string - DataDir string - LogDir string - TLSCertPath string - TLSKeyPath string - AdminMacPath string - ReadMacPath string - P2PPort int - RPCPort int - RESTPort int + DataDir string + LogDir string + TLSCertPath string + TLSKeyPath string + AdminMacPath string + ReadMacPath string + InvoiceMacPath string + + P2PPort int + RPCPort int + RESTPort int } func (cfg nodeConfig) P2PAddr() string { @@ -152,6 +154,7 @@ func (cfg nodeConfig) genArgs() []string { args = append(args, fmt.Sprintf("--configfile=%v", cfg.DataDir)) args = append(args, fmt.Sprintf("--adminmacaroonpath=%v", cfg.AdminMacPath)) args = append(args, fmt.Sprintf("--readonlymacaroonpath=%v", cfg.ReadMacPath)) + args = append(args, fmt.Sprintf("--invoicemacaroonpath=%v", cfg.InvoiceMacPath)) args = append(args, fmt.Sprintf("--externalip=%s", cfg.P2PAddr())) args = append(args, fmt.Sprintf("--trickledelay=%v", trickleDelay)) @@ -211,6 +214,7 @@ func newNode(cfg nodeConfig) (*HarnessNode, error) { cfg.TLSKeyPath = filepath.Join(cfg.DataDir, "tls.key") cfg.AdminMacPath = filepath.Join(cfg.DataDir, "admin.macaroon") cfg.ReadMacPath = filepath.Join(cfg.DataDir, "readonly.macaroon") + cfg.InvoiceMacPath = filepath.Join(cfg.DataDir, "invoice.macaroon") cfg.P2PPort, cfg.RPCPort, cfg.RESTPort = generateListeningPorts()