From 035151c6c20ce7798f908ac708f4366a2a239409 Mon Sep 17 00:00:00 2001 From: Raymond Sukanto Date: Wed, 13 Nov 2024 19:35:51 -0500 Subject: [PATCH] fix conflict --- pkg/node/local.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/node/local.go b/pkg/node/local.go index 6d558b127..b69c9b8d8 100644 --- a/pkg/node/local.go +++ b/pkg/node/local.go @@ -208,7 +208,7 @@ func StartLocalNode( } } serverLogPath := filepath.Join(rootDir, "server.log") - sd := subnet.NewLocalDeployer(app, avalancheGoVersion, avalanchegoBinaryPath, "") + sd := subnet.NewLocalDeployer(app, avalancheGoVersion, avalanchegoBinaryPath, "", true) if err := sd.StartServer( constants.ServerRunFileLocalClusterPrefix, binutils.LocalClusterGRPCServerPort, @@ -623,10 +623,10 @@ func LocalStatus(app *application.Avalanche, clusterName string, blockchainName } func GetInfo(uri string, blockchainID string) ( - ids.NodeID, // nodeID + ids.NodeID, // nodeID *signer.ProofOfPossession, // nodePOP - bool, // isBootstrapped - error, // error + bool, // isBootstrapped + error, // error ) { client := info.NewClient(uri) ctx, cancel := utils.GetAPILargeContext() @@ -644,7 +644,7 @@ func GetInfo(uri string, blockchainID string) ( func GetBlockchainStatus(uri string, blockchainID string) ( string, // status - error, // error + error, // error ) { client := platformvm.NewClient(uri) ctx, cancel := utils.GetAPILargeContext()