fix conflict

ava-labs · Nov 14, 2024 · 035151c · 035151c
1 parent ed04296
commit 035151c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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()