fix: Remove old fields from wallet network configuration

vegaprotocol · Oct 2, 2023 · a3ea32b · a3ea32b
1 parent bb1593f
commit a3ea32b
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 62 deletions.
diff --git a/config/wallet_config.go b/config/wallet_config.go
@@ -55,7 +55,7 @@ type WalletConfig struct {
 
 	/*
 		description: |
-			[Go template](templates.md) of a Vega Wallet config.
+			[Go template](templates.md) of a Vega Wallet network configuration.
 
 			The [wallet.ConfigTemplateContext](templates.md#walletconfigtemplatecontext) can be used in the template.
 			Example can be found in [default network config](net_confs/config.hcl).

diff --git a/generator/initiate.go b/generator/initiate.go
@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"sync"
 
+	"golang.org/x/sync/errgroup"
+
 	"code.vegaprotocol.io/vegacapsule/config"
 	"code.vegaprotocol.io/vegacapsule/generator/nomad"
 	"code.vegaprotocol.io/vegacapsule/generator/wallet"
 	"code.vegaprotocol.io/vegacapsule/types"
-	"golang.org/x/sync/errgroup"
 )
 
 func (g *Generator) initiateNodeSet(absoluteIndex, relativeIndex, groupIndex int, nc config.NodeConfig) (*types.NodeSet, error) {

diff --git a/net_confs/config.hcl b/net_confs/config.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:{{add 300 $i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_checkpoint.hcl b/net_confs/config_checkpoint.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_clef.hcl b/net_confs/config_clef.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_data_node_snapshot.hcl b/net_confs/config_data_node_snapshot.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_external_postgres.hcl b/net_confs/config_external_postgres.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {    
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_frontends.hcl b/net_confs/config_frontends.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {    
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:{{add 300 $i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_nullchain.hcl b/net_confs/config_nullchain.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_nullchain_no_erc20.hcl b/net_confs/config_nullchain_no_erc20.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_sentry_datanode.hcl b/net_confs/config_sentry_datanode.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .NonValidators}}{{if eq $v.GroupName "sentry-0" "sentry-1" "sentry-2"}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$v.Index}}2"{{end}}{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_visor_mixed.hcl b/net_confs/config_visor_mixed.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/config_visor_only.hcl b/net_confs/config_visor_only.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }
 

diff --git a/net_confs/stagnet_config.hcl b/net_confs/stagnet_config.hcl
@@ -20,15 +20,10 @@ EOT
   wallet "wallet-1" {
     template = <<-EOT
 Name = "DV"
-Level = "info"
-TokenExpiry = "168h0m0s"
-Port = 1789
-Host = "0.0.0.0"
 
 [API]
   [API.GRPC]
     Hosts = [{{range $i, $v := .Validators}}{{if ne $i 0}},{{end}}"127.0.0.1:30{{$i}}2"{{end}}]
-    Retries = 5
 EOT
   }