From ffe5b280804cea2a3bf1500da922b1811635d693 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 12 Nov 2024 07:03:30 +0000 Subject: [PATCH] chore(deps): switch to the stdlib atomic package in snapshot code (#12666) We probably used uber's by mistake. It comes into our dependency tree via go-ipld-blockstore and will leave via https://github.com/filecoin-project/filecoin-ffi/pull/497. --- chain/store/snapshot.go | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chain/store/snapshot.go b/chain/store/snapshot.go index c4b9f371747..e641540c75b 100644 --- a/chain/store/snapshot.go +++ b/chain/store/snapshot.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "sync" + "sync/atomic" "time" blocks "github.com/ipfs/go-block-format" @@ -17,7 +18,6 @@ import ( carv2 "github.com/ipld/go-car/v2" "github.com/multiformats/go-multicodec" cbg "github.com/whyrusleeping/cbor-gen" - "go.uber.org/atomic" "golang.org/x/sync/errgroup" "golang.org/x/xerrors" diff --git a/go.mod b/go.mod index 20d598dff7a..42100a1f73a 100644 --- a/go.mod +++ b/go.mod @@ -151,7 +151,6 @@ require ( go.opentelemetry.io/otel/metric v1.28.0 go.opentelemetry.io/otel/sdk v1.28.0 go.opentelemetry.io/otel/sdk/metric v1.28.0 - go.uber.org/atomic v1.11.0 go.uber.org/fx v1.22.1 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -328,6 +327,7 @@ require ( gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect go.dedis.ch/kyber/v4 v4.0.0-pre2.0.20240924132404-4de33740016e // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.17.1 // indirect go.uber.org/mock v0.4.0 // indirect go4.org v0.0.0-20230225012048-214862532bf5 // indirect