merge: branch '3615-config-schema' into 'main'

Convert cmd/accumulated/run to schema [#3615] Closes #3615 See merge request accumulatenetwork/accumulate!1083
AccumulateNetwork · Jul 11, 2024 · 576d3c6 · 576d3c6
2 parents e7299fe + f46fea8
commit 576d3c6
Show file tree

Hide file tree

Showing 24 changed files with 3,373 additions and 5,184 deletions.
diff --git a/cmd/accumulated-http/main.go b/cmd/accumulated-http/main.go
@@ -25,6 +25,7 @@ import (
 	. "gitlab.com/accumulatenetwork/accumulate/internal/util/cmd"
 	cmdutil "gitlab.com/accumulatenetwork/accumulate/internal/util/cmd"
 	"gitlab.com/accumulatenetwork/accumulate/pkg/accumulate"
+	"gitlab.com/accumulatenetwork/accumulate/pkg/types/encoding"
 )
 
 func main() {
@@ -116,7 +117,7 @@ func run(cmd *cobra.Command, args []string) {
 		HttpListener: HttpListener{
 			Listen:            flag.HttpListen,
 			ConnectionLimit:   &flag.ConnLimit,
-			ReadHeaderTimeout: &flag.Timeout,
+			ReadHeaderTimeout: (*encoding.Duration)(&flag.Timeout),
 			TlsCertPath:       flag.TlsCert,
 			TlsKeyPath:        flag.TlsKey,
 		},

diff --git a/cmd/accumulated/cmd_init_devnet.go b/cmd/accumulated/cmd_init_devnet.go
@@ -93,8 +93,8 @@ func applyDevNetFlags(cmd *cobra.Command, cfg *run.Config, dev *run.DevnetConfig
 	}
 
 	if cmd.Flag("database").Changed {
-		typ, ok := run.StorageTypeByName(flagRunDevnet.Database)
-		if !ok {
+		var typ run.StorageType
+		if !typ.SetByName(flagRunDevnet.Database) {
 			fatalf("--database: %q is not a valid storage type", flagRunDevnet.Database)
 		}
 		dev.StorageType = &typ