diff options
| author | Florian Klink <flokli@flokli.de> | 2023-10-11T11·56+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-10-11T15·22+0000 |
| commit | 155ab77cffbe8d3fe0c0b5d23416dd32fbdb1cff (patch) | |
| tree | c0b87215b2b321051e29e985bd5edc9b1eed8df9 /tvix/nar-bridge/pkg/http | |
| parent | fb04645b0d6242b1f75da0b2d20d3371a7a9be51 (diff) | |
refactor(tvix/nar-bridge): use mh.SHA2_256 r/6783
As correctly mentioned in https://cl.tvl.fyi/c/depot/+/9652/comment/03b9b96e_bbb337fd/, we shouldn't be using these magic constants, but pull them from where they're defined. This already is a dependency of go-nix, and pkg/pathinfosvc/server.go, so no changes in go.mod. Change-Id: I0cc41ce040fcbddf4b6171417bc9b0de55af4991 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9653 Tested-by: BuildkiteCI Reviewed-by: Brian McGee <brian@bmcgee.ie>
Diffstat (limited to 'tvix/nar-bridge/pkg/http')
| -rw-r--r-- | tvix/nar-bridge/pkg/http/nar_put.go | 3 | ||||
| -rw-r--r-- | tvix/nar-bridge/pkg/http/narinfo.go | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tvix/nar-bridge/pkg/http/nar_put.go b/tvix/nar-bridge/pkg/http/nar_put.go index d074fcb20f00..9a4238e61395 100644 --- a/tvix/nar-bridge/pkg/http/nar_put.go +++ b/tvix/nar-bridge/pkg/http/nar_put.go @@ -9,6 +9,7 @@ import ( castorev1pb "code.tvl.fyi/tvix/castore/protos" "code.tvl.fyi/tvix/nar-bridge/pkg/importer" "github.com/go-chi/chi/v5" + mh "github.com/multiformats/go-multihash/core" nixhash "github.com/nix-community/go-nix/pkg/hash" "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus" @@ -101,7 +102,7 @@ func registerNarPut(s *Server) { // Compare the nar hash specified in the URL with the one that has been // calculated while processing the NAR file. - narHash, err := nixhash.FromHashTypeAndDigest(0x12, narSha256) + narHash, err := nixhash.FromHashTypeAndDigest(mh.SHA2_256, narSha256) if err != nil { panic("must parse nixbase32") } diff --git a/tvix/nar-bridge/pkg/http/narinfo.go b/tvix/nar-bridge/pkg/http/narinfo.go index 5d963c34f91d..c938baba6590 100644 --- a/tvix/nar-bridge/pkg/http/narinfo.go +++ b/tvix/nar-bridge/pkg/http/narinfo.go @@ -4,7 +4,9 @@ import ( "fmt" storev1pb "code.tvl.fyi/tvix/store/protos" + mh "github.com/multiformats/go-multihash/core" nixhash "github.com/nix-community/go-nix/pkg/hash" + "github.com/nix-community/go-nix/pkg/narinfo" "github.com/nix-community/go-nix/pkg/narinfo/signature" "github.com/nix-community/go-nix/pkg/nixbase32" @@ -30,7 +32,7 @@ func ToNixNarInfo(p *storev1pb.PathInfo) (*narinfo.NarInfo, error) { // produce nixhash for the narsha256. narHash, err := nixhash.FromHashTypeAndDigest( - 0x12, // SHA2_256 + mh.SHA2_256, p.GetNarinfo().GetNarSha256(), ) if err != nil { |