From 92463013fa18883e7d1e6c15a89d0382265043f8 Mon Sep 17 00:00:00 2001 From: Kun Lai Date: Wed, 13 May 2026 16:50:06 +0800 Subject: [PATCH 1/2] fix(verity-go): correct README examples and module path - Fix CLI flag: use -m (metadata output) instead of --hash-output which only outputs the root hash - Remove unused Go imports (fmt in serialize example, encoding/hex in deserialize example) that would cause compilation failure - Set module name to github.com/openanolis/cryptpilot/verity-go so go get import paths match the README documentation - Update all internal import paths to match the new module name --- verity-go/README.md | 4 +--- verity-go/README_CN.md | 4 +--- verity-go/go.mod | 2 +- verity-go/metadata/interop_test.go | 2 +- verity-go/metadata/metadata.go | 4 ++-- verity-go/metadata/metadata_hash.go | 2 +- verity-go/metadata/metadata_test.go | 2 +- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/verity-go/README.md b/verity-go/README.md index f25cf49..3d38627 100644 --- a/verity-go/README.md +++ b/verity-go/README.md @@ -30,7 +30,7 @@ compute fs-verity for each file, build the Merkle tree, and write the FlatBuffer metadata file: ```bash -cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod --hash-output metadata.fb +cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod -m metadata.fb ``` #### Option B: Go implementation @@ -42,7 +42,6 @@ package main import ( "encoding/hex" - "fmt" "os" "github.com/openanolis/cryptpilot/verity-go/metadata" @@ -76,7 +75,6 @@ are available: package main import ( - "encoding/hex" "fmt" "os" diff --git a/verity-go/README_CN.md b/verity-go/README_CN.md index 7e8e47f..37b73da 100644 --- a/verity-go/README_CN.md +++ b/verity-go/README_CN.md @@ -29,7 +29,7 @@ Rust `cryptpilot-verity` CLI 可自动完成完整流程 — 遍历目录、 计算每个文件的 fs-verity、构建 Merkle 树、输出 FlatBuffers 元数据文件： ```bash -cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod --hash-output metadata.fb +cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod -m metadata.fb ``` #### 方式 B：Go 代码实现 @@ -41,7 +41,6 @@ package main import ( "encoding/hex" - "fmt" "os" "github.com/openanolis/cryptpilot/verity-go/metadata" @@ -74,7 +73,6 @@ func main() { package main import ( - "encoding/hex" "fmt" "os" diff --git a/verity-go/go.mod b/verity-go/go.mod index eb19100..efd2ce5 100644 --- a/verity-go/go.mod +++ b/verity-go/go.mod @@ -1,4 +1,4 @@ -module cryptpilot-verity-go +module github.com/openanolis/cryptpilot/verity-go go 1.24 diff --git a/verity-go/metadata/interop_test.go b/verity-go/metadata/interop_test.go index 5e87c87..8ce0b1d 100644 --- a/verity-go/metadata/interop_test.go +++ b/verity-go/metadata/interop_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "cryptpilot-verity-go/verity" + "github.com/openanolis/cryptpilot/verity-go/verity" ) // expectedDescriptorHashes maps test file name to expected SHA-256 descriptor hash. diff --git a/verity-go/metadata/metadata.go b/verity-go/metadata/metadata.go index 8e868ea..75d1164 100644 --- a/verity-go/metadata/metadata.go +++ b/verity-go/metadata/metadata.go @@ -6,8 +6,8 @@ import ( "fmt" "sort" - "cryptpilot-verity-go/metadata/generated" - "cryptpilot-verity-go/verity" + "github.com/openanolis/cryptpilot/verity-go/metadata/generated" + "github.com/openanolis/cryptpilot/verity-go/verity" flatbuffers "github.com/google/flatbuffers/go" ) diff --git a/verity-go/metadata/metadata_hash.go b/verity-go/metadata/metadata_hash.go index 6fd56dd..74b7676 100644 --- a/verity-go/metadata/metadata_hash.go +++ b/verity-go/metadata/metadata_hash.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "fmt" - "cryptpilot-verity-go/metadata/generated" + "github.com/openanolis/cryptpilot/verity-go/metadata/generated" flatbuffers "github.com/google/flatbuffers/go" ) diff --git a/verity-go/metadata/metadata_test.go b/verity-go/metadata/metadata_test.go index ce66900..592c6d8 100644 --- a/verity-go/metadata/metadata_test.go +++ b/verity-go/metadata/metadata_test.go @@ -6,7 +6,7 @@ import ( "encoding/hex" "testing" - "cryptpilot-verity-go/verity" + "github.com/openanolis/cryptpilot/verity-go/verity" ) func makeTestFileVerityInfo(path string, data []byte) FileVerityInfo { From 7e001be08093068241b7bbd5d67999483a07b7ac Mon Sep 17 00:00:00 2001 From: Kun Lai Date: Wed, 13 May 2026 16:52:38 +0800 Subject: [PATCH 2/2] fix(verity-go): add missing --hash-output flag to CLI example --- verity-go/README.md | 2 +- verity-go/README_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/verity-go/README.md b/verity-go/README.md index 3d38627..d60050f 100644 --- a/verity-go/README.md +++ b/verity-go/README.md @@ -30,7 +30,7 @@ compute fs-verity for each file, build the Merkle tree, and write the FlatBuffer metadata file: ```bash -cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod -m metadata.fb +cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod -m metadata.fb --hash-output - ``` #### Option B: Go implementation diff --git a/verity-go/README_CN.md b/verity-go/README_CN.md index 37b73da..13b7023 100644 --- a/verity-go/README_CN.md +++ b/verity-go/README_CN.md @@ -29,7 +29,7 @@ Rust `cryptpilot-verity` CLI 可自动完成完整流程 — 遍历目录、 计算每个文件的 fs-verity、构建 Merkle 树、输出 FlatBuffers 元数据文件： ```bash -cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod -m metadata.fb +cargo run -p cryptpilot-verity -- format /path/to/dir --label env=prod -m metadata.fb --hash-output - ``` #### 方式 B：Go 代码实现