Fix devnet ports

AccumulateNetwork · Jun 15, 2024 · 1b23603 · 1b23603
1 parent ad9f5e6
commit 1b23603
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 24 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -141,7 +141,7 @@
     },
     // Run
     {
-      "name": "Init (devnet)",
+      "name": "Run (devnet)",
       "presentation": {
         "group": "20-Run"
       },
@@ -150,29 +150,11 @@
       "mode": "auto",
       "program": "${workspaceFolder}/cmd/accumulated",
       "args": [
-        "init",
-        "devnet",
-        "-w=${workspaceFolder}/.nodes",
-        "--reset",
-        "-b=1",
+        "run", "devnet",
+        "-w=${workspaceFolder}/.nodes/devnet",
+        "-b=2",
         "-v=1",
         "-f=0",
-        "-s=0",
-        "--globals={\"executorVersion\": \"v2\"}",
-        "--faucet-seed=ci",
-      ]
-    },
-    {
-      "name": "Run (devnet)",
-      "presentation": {
-        "group": "20-Run"
-      },
-      "type": "go",
-      "request": "launch",
-      "mode": "auto",
-      "program": "${workspaceFolder}/cmd/accumulated",
-      "args": [
-        "${workspaceFolder}/.nodes/devnet",
       ]
     },
     {

diff --git a/cmd/accumulated/run/devnet.go b/cmd/accumulated/run/devnet.go
@@ -371,7 +371,7 @@ func (n nodeOpts) apply(inst *Instance, root *Config) error {
 	// Create partition services
 	opts := partOpts{
 		CoreValidatorConfiguration: &CoreValidatorConfiguration{
-			Listen:       listen(n.DevNet.Listen, devNetDefaultHost, n.IP, portDir),
+			Listen:       listen(n.DevNet.Listen, devNetDefaultHost, n.IP),
 			ValidatorKey: rawPrivKeyFrom(n.PrivVal),
 			StorageType:  n.DevNet.StorageType,
 		},
@@ -391,7 +391,6 @@ func (n nodeOpts) apply(inst *Instance, root *Config) error {
 	opts.Type = protocol.PartitionTypeBlockValidator
 	opts.Dir = "bvnn"
 	opts.Genesis = filepath.Join("..", fmt.Sprintf("bvn%d-genesis.snap", n.BVN))
-	opts.Listen = listen(n.DevNet.Listen, devNetDefaultHost, n.IP, portBVN)
 	opts.MetricsNamespace = fmt.Sprintf("consensus_bvn%d_%d", n.BVN, n.IP)
 	opts.BootstrapPeers = n.BvnBootstrap
 	err = opts.apply(cfg)