lntest: update test node arguments to account for new invoice.macaroon

This commit is contained in:
Olaoluwa Osuntokun committed 2018-03-21 15:46:51 -07:00
1 parent 7d14ed7a06
commit 4a3980353d
1 file changed
+13 -9
+13 -9
View File
@@ -90,15 +90,17 @@ type nodeConfig struct {
BaseDir string BaseDir string
ExtraArgs []string ExtraArgs []string
DataDir string DataDir string
LogDir string LogDir string
TLSCertPath string TLSCertPath string
TLSKeyPath string TLSKeyPath string
AdminMacPath string AdminMacPath string
ReadMacPath string ReadMacPath string
P2PPort int InvoiceMacPath string
RPCPort int
RESTPort int P2PPort int
RPCPort int
RESTPort int
} }
func (cfg nodeConfig) P2PAddr() string { 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("--configfile=%v", cfg.DataDir))
args = append(args, fmt.Sprintf("--adminmacaroonpath=%v", cfg.AdminMacPath)) args = append(args, fmt.Sprintf("--adminmacaroonpath=%v", cfg.AdminMacPath))
args = append(args, fmt.Sprintf("--readonlymacaroonpath=%v", cfg.ReadMacPath)) 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("--externalip=%s", cfg.P2PAddr()))
args = append(args, fmt.Sprintf("--trickledelay=%v", trickleDelay)) 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.TLSKeyPath = filepath.Join(cfg.DataDir, "tls.key")
cfg.AdminMacPath = filepath.Join(cfg.DataDir, "admin.macaroon") cfg.AdminMacPath = filepath.Join(cfg.DataDir, "admin.macaroon")
cfg.ReadMacPath = filepath.Join(cfg.DataDir, "readonly.macaroon") cfg.ReadMacPath = filepath.Join(cfg.DataDir, "readonly.macaroon")
cfg.InvoiceMacPath = filepath.Join(cfg.DataDir, "invoice.macaroon")
cfg.P2PPort, cfg.RPCPort, cfg.RESTPort = generateListeningPorts() cfg.P2PPort, cfg.RPCPort, cfg.RESTPort = generateListeningPorts()