oasis-net-runner: Use per-file init() functions

oasisprotocol · Apr 23, 2020 · 21e08c2 · 21e08c2
1 parent a07ff2a
commit 21e08c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/go/oasis-net-runner/fixtures/default.go b/go/oasis-net-runner/fixtures/default.go
@@ -128,7 +128,7 @@ func newDefaultFixture() (*oasis.NetworkFixture, error) {
 	}, nil
 }
 
-func initDefaultFixtureFlags() {
+func init() {
 	DefaultFixtureFlags.Bool(cfgEpochtimeMock, false, "use mock epochtime")
 	DefaultFixtureFlags.Uint64(cfgHaltEpoch, math.MaxUint64, "halt epoch height")
 	DefaultFixtureFlags.String(cfgKeymanagerBinary, "simple-keymanager", "path to the keymanager runtime")

diff --git a/go/oasis-net-runner/fixtures/file.go b/go/oasis-net-runner/fixtures/file.go
@@ -10,7 +10,11 @@ import (
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/oasis"
 )
 
-// newFixtureFromFile parses given JSON file and creates a new fixture object from it.
+const (
+	cfgFile = "fixture.file"
+)
+
+// newFixtureFromFile parses given JSON file and creates new fixture object from it.
 func newFixtureFromFile(path string) (*oasis.NetworkFixture, error) {
 	f := oasis.NetworkFixture{}
 	data, err := ioutil.ReadFile(path)
@@ -24,7 +28,7 @@ func newFixtureFromFile(path string) (*oasis.NetworkFixture, error) {
 	return &f, nil
 }
 
-func initFileFixtureFlags() {
+func init() {
 	FileFixtureFlags.String(cfgFile, "", "path to JSON-encoded fixture input file")
 	_ = viper.BindPFlags(FileFixtureFlags)
 }
diff --git a/go/oasis-net-runner/fixtures/fixtures.go b/go/oasis-net-runner/fixtures/fixtures.go
@@ -10,10 +10,6 @@ import (
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/oasis"
 )
 
-const (
-	cfgFile = "fixture.file"
-)
-
 var (
 	// FileFixtureFlags are command line flags for the fixtures.
 	FileFixtureFlags = flag.NewFlagSet("", flag.ContinueOnError)
@@ -22,7 +18,7 @@ var (
 	DefaultFixtureFlags = flag.NewFlagSet("", flag.ContinueOnError)
 )
 
-// GetFixture generates a fixture object from given file or default fixture, if no fixtures file provided.
+// GetFixture generates fixture object from given file or default fixture, if no fixtures file provided.
 func GetFixture() (f *oasis.NetworkFixture, err error) {
 	if viper.IsSet(cfgFile) {
 		f, err = newFixtureFromFile(viper.GetString(cfgFile))
@@ -45,8 +41,3 @@ func DumpFixture(f *oasis.NetworkFixture) ([]byte, error) {
 
 	return data, nil
 }
-
-func init() {
-	initDefaultFixtureFlags()
-	initFileFixtureFlags()
-}