cleanup

ObolNetwork · May 31, 2022 · b7f3dfc · b7f3dfc
1 parent 53812ff
commit b7f3dfc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,5 +61,4 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
-      - run: ls -la
       - run: go test -v github.com/obolnetwork/charon/testutil/compose/compose -integration
diff --git a/cmd/createcluster.go b/cmd/createcluster.go
@@ -287,7 +287,7 @@ func writeDepositData(conf clusterConfig, secrets []*bls_sig.SecretKey) error {
 
 	// Write it to disk
 	depositPath := path.Join(conf.ClusterDir, "deposit-data.json")
-	err = os.WriteFile(depositPath, bytes, 0o444) // read-only
+	err = os.WriteFile(depositPath, bytes, 0o400) // read-only
 	if err != nil {
 		return errors.Wrap(err, "write deposit data")
 	}
@@ -308,7 +308,7 @@ func writeLock(conf clusterConfig, dvs []tbls.TSS, peers []p2p.Peer) error {
 	}
 
 	lockPath := path.Join(conf.ClusterDir, "cluster-lock.json")
-	err = os.WriteFile(lockPath, b, 0o444) // read-only
+	err = os.WriteFile(lockPath, b, 0o400) // read-only
 	if err != nil {
 		return errors.Wrap(err, "write cluster lock")
 	}

diff --git a/eth2util/keystore/keystore.go b/eth2util/keystore/keystore.go
@@ -188,7 +188,7 @@ func loadPassword(keyFile string) (string, error) {
 func storePassword(keyFile string, password string) error {
 	passwordFile := strings.Replace(keyFile, ".json", ".txt", 1)
 
-	err := os.WriteFile(passwordFile, []byte(password), 0o444)
+	err := os.WriteFile(passwordFile, []byte(password), 0o400)
 	if err != nil {
 		return errors.Wrap(err, "write password file")
 	}

diff --git a/testutil/compose/compose/main.go b/testutil/compose/compose/main.go
@@ -91,8 +91,6 @@ func newRunnerFunc(topic string, dir string, up bool, runFunc runFunc,
 			return compose.TmplData{}, err
 		}
 
-		exe(ctx, dir, "ls", "-la")
-
 		log.Info(ctx, "Running compose command", z.Str("command", topic))
 
 		data, err = runFunc(ctx, dir, conf)
@@ -108,13 +106,6 @@ func newRunnerFunc(topic string, dir string, up bool, runFunc runFunc,
 	}
 }
 
-func exe(ctx context.Context, dir string, cmd string, args ...string) {
-	c := exec.Command(cmd, args...)
-	c.Dir = dir
-	out, err := c.CombinedOutput()
-	log.Info(ctx, "EXEC", z.Str("out", string(out)), z.Str("dir", dir), z.Err(err))
-}
-
 // newDockerCmd returns a cobra command that generates docker-compose.yml files and executes it.
 func newDockerCmd(use string, short string, runFunc runFunc) *cobra.Command {
 	cmd := &cobra.Command{