From ca834b652f8c6d71016c4c1fb720a0d93471ec99 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 26 Apr 2023 14:57:24 +0200 Subject: [PATCH 1/2] Switch to xxhash/v2 This is related to https://github.com/ipfs/kubo/issues/9839. boxo still depends on badger, which still requires xxhash/v1, but at least doesn't require it xxhash/v1 itself directly anymore. --- gateway/assets/assets.go | 2 +- gateway/handler_ipns_record.go | 2 +- go.mod | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gateway/assets/assets.go b/gateway/assets/assets.go index ceb88545b..5a478adc7 100644 --- a/gateway/assets/assets.go +++ b/gateway/assets/assets.go @@ -13,7 +13,7 @@ import ( "path" "strings" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" ipfspath "github.com/ipfs/boxo/path" ) diff --git a/gateway/handler_ipns_record.go b/gateway/handler_ipns_record.go index e5ada50e5..9d4f93e06 100644 --- a/gateway/handler_ipns_record.go +++ b/gateway/handler_ipns_record.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/cespare/xxhash" + "github.com/cespare/xxhash/v2" "github.com/gogo/protobuf/proto" ipath "github.com/ipfs/boxo/coreiface/path" ipns_pb "github.com/ipfs/boxo/ipns/pb" diff --git a/go.mod b/go.mod index 4acc68283..7a142ad40 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a github.com/benbjohnson/clock v1.3.0 github.com/cenkalti/backoff v2.2.1+incompatible - github.com/cespare/xxhash v1.1.0 + github.com/cespare/xxhash/v2 v2.2.0 github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 github.com/cskr/pubsub v1.0.2 github.com/dustin/go-humanize v1.0.0 @@ -89,7 +89,7 @@ require ( github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash v1.1.0 // indirect github.com/containerd/cgroups v1.0.4 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect From f1f2105bb8033dbef9254a159feb10c2a38c4b2b Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 26 Apr 2023 15:16:25 +0200 Subject: [PATCH 2/2] go mod tidy in examples --- examples/go.mod | 1 - examples/go.sum | 2 -- 2 files changed, 3 deletions(-) diff --git a/examples/go.mod b/examples/go.mod index 6b8efa730..7bc34d224 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -26,7 +26,6 @@ require ( github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect - github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/containerd/cgroups v1.0.4 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect diff --git a/examples/go.sum b/examples/go.sum index 51c7700a9..92b3d5df2 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -40,7 +40,6 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -63,7 +62,6 @@ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7 github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=