Format code with gofumpt

igoose1 · Jan 23, 2024 · ae3ba41 · ae3ba41
1 parent 8808922
commit ae3ba41
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@84cbf8094393cdc5fe1fe1671ff2647332956b1a  # v3.2.1
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Checkout repository
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b  # v3.0.2

diff --git a/main.go b/main.go
@@ -57,7 +57,6 @@ func main() {
 		trustedDir string
 	)
 	verifyCommand := flag.NewFlagSet("-V", flag.ExitOnError)
-	// flag.BoolVar(&hashFlag, "H", false, "require input to be prehashed.")
 	verifyCommand.StringVar(&sigFile, "x", "", "signature file (default: <file>.minisig)")
 	verifyCommand.BoolVar(&outputFlag, "o", false, "output the file content after verification")
 	verifyCommand.StringVar(&file, "m", "", "file to verify.")
@@ -74,7 +73,7 @@ func main() {
 		if err != nil {
 			logger.Fatal(err)
 		}
-		trustedDir = filepath.Join(homedir, ".minisign/trusted")
+		trustedDir = filepath.Join(homedir, ".minisign", "trusted")
 	}
 
 	if len(os.Args) < 2 {

diff --git a/pkg/minitrust/base.go b/pkg/minitrust/base.go
@@ -29,6 +29,7 @@ func (b *Base) EnsureTrustedDir() error {
 	}
 	return nil
 }
+
 func (b *Base) getKeyPath(keyID [8]byte) string {
 	return filepath.Join(b.trustedDir, EncodeID(keyID)+".pub")
 }

diff --git a/pkg/minitrust/base_test.go b/pkg/minitrust/base_test.go
@@ -6,8 +6,10 @@ import (
 	"testing"
 )
 
-const rawPubKey = "RWRWfuqg9DPmJzteqVmj5xSm7z1V0ZTNA66UGpF+5vdkUe8llEMWkC6n"
-const pubKeyID = "27E633F4A0EA7E56"
+const (
+	rawPubKey = "RWRWfuqg9DPmJzteqVmj5xSm7z1V0ZTNA66UGpF+5vdkUe8llEMWkC6n"
+	pubKeyID  = "27E633F4A0EA7E56"
+)
 
 func mkdirTempHome(t *testing.T) string {
 	dir, err := os.MkdirTemp("", "test-minitrust-*")
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ func (b *Base) EnsureTrustedDir() error { @@
     	}
     	return nil
     }
     func (b *Base) getKeyPath(keyID [8]byte) string {
     	return filepath.Join(b.trustedDir, EncodeID(keyID)+".pub")
     }
@@ Expand Down @@