Merge pull request #741 from iotaledger/remove/genesis-snapshot-submo…

…dule Remove submodule for genesis-snapshot to enable import by other projects
iotaledger · Feb 15, 2024 · cd5b582 · cd5b582
2 parents df4e244 + a71b225
commit cd5b582
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 240 deletions.
diff --git a/.github/workflows/build_tools.yml b/.github/workflows/build_tools.yml
@@ -24,4 +24,4 @@ jobs:
 
       - name: Build genesis-snapshot tool
         working-directory: tools/genesis-snapshot
-        run: go mod tidy && go build .
+        run: go build .
diff --git a/.github/workflows/feature-network-deploy.yml b/.github/workflows/feature-network-deploy.yml
@@ -44,7 +44,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version-file: 'tools/genesis-snapshot/go.mod'
+          go-version-file: 'go.mod'
           cache: false
 
       - name: Print Go version

diff --git a/scripts/go_mod_tidy.sh b/scripts/go_mod_tidy.sh
@@ -7,8 +7,4 @@ pushd tools/gendoc
 go mod tidy
 popd
 
-pushd tools/genesis-snapshot
-go mod tidy
-popd
-
 popd
diff --git a/tools/genesis-snapshot/go.mod b/tools/genesis-snapshot/go.mod
diff --git a/tools/genesis-snapshot/go.sum b/tools/genesis-snapshot/go.sum
diff --git a/tools/genesis-snapshot/main.go b/tools/genesis-snapshot/main.go
@@ -18,11 +18,11 @@ func main() {
 	parsedOpts, configSelected := parseFlags()
 	opts := presets.Base
 	if strings.Contains(configSelected, ".yml") {
-		if yamlOpts, err := presets.GenerateFromYaml(configSelected); err != nil {
+		yamlOpts, err := presets.GenerateFromYaml(configSelected)
+		if err != nil {
 			panic(err)
-		} else {
-			opts = append(opts, yamlOpts...)
 		}
+		opts = append(opts, yamlOpts...)
 	} else {
 		switch configSelected {
 		case "docker":

diff --git a/tools/genesis-snapshot/presets/presets.go b/tools/genesis-snapshot/presets/presets.go
@@ -16,19 +16,19 @@ import (
 )
 
 var (
-	// use defaults from iota.go
+	// use defaults from iota.go.
 	protocolParamsBase = iotago.NewV3SnapshotProtocolParameters(
 		iotago.WithNetworkOptions("default", iotago.PrefixTestnet),
 	)
 
-	// use defaults from iota.go
+	// use defaults from iota.go.
 	protocolParamsDocker = iotago.NewV3SnapshotProtocolParameters(
 		iotago.WithNetworkOptions("docker", iotago.PrefixTestnet),
 		iotago.WithTimeProviderOptions(5, time.Now().Unix(), 10, 7),
 		iotago.WithLivenessOptions(10, 15, 3, 6, 8),
 	)
 
-	// use defaults from iota.go
+	// use defaults from iota.go.
 	protocolParamsFeature = iotago.NewV3SnapshotProtocolParameters(
 		iotago.WithNetworkOptions("feature", iotago.PrefixTestnet),
 		iotago.WithTimeProviderOptions(666666, time.Now().Unix()-100_000, 10, 13),