From 0703be44e9cba641ed8ad2710e8f046aa93222d0 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 23 Dec 2024 01:29:51 -0800 Subject: [PATCH] chore: remove cenkalti/backoff dependency Signed-off-by: Christian Stewart --- go.mod | 6 ++---- go.sum | 10 ++++------ rpc/access/client-controller.go | 2 +- signaling/rpc/client/client.go | 2 +- signaling/rpc/client/controller.go | 2 +- transport/common/dialer/dialer.go | 2 +- transport/webrtc/webrtc.go | 2 +- 7 files changed, 11 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index d1dc7a59..5f8f96aa 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ toolchain go1.23.4 require ( github.com/aperturerobotics/common v0.20.3 // latest - github.com/aperturerobotics/controllerbus v0.48.2 // latest + github.com/aperturerobotics/controllerbus v0.49.0 // latest github.com/aperturerobotics/entitygraph v0.10.1 // latest github.com/aperturerobotics/protobuf-go-lite v0.8.0 // latest github.com/aperturerobotics/starpc v0.36.1 // latest - github.com/aperturerobotics/util v1.27.0 // latest + github.com/aperturerobotics/util v1.27.1 // latest ) // aperture: use compatibility forks @@ -54,8 +54,6 @@ require ( gonum.org/v1/gonum v0.15.1 ) -require github.com/cenkalti/backoff/v4 v4.3.0 - require ( github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect diff --git a/go.sum b/go.sum index 3fa03690..da551fac 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/aperturerobotics/bifrost-nats-server/v2 v2.1.8-0.20221228081037-b7c2d github.com/aperturerobotics/bifrost-nats-server/v2 v2.1.8-0.20221228081037-b7c2df0c151f/go.mod h1:kIcZtLpq4UIZzOqduYLm1mYU1nuMBtN6XuDCtQ21QT8= github.com/aperturerobotics/common v0.20.3 h1:pzcwAbLdyC4sgHOquGTkwK1ww/LlPscxiNpJ3u0Upg8= github.com/aperturerobotics/common v0.20.3/go.mod h1:S2yc+bp5PoLn0PHOAt+XXGsC50sA0MU9GF3q6FyEs9U= -github.com/aperturerobotics/controllerbus v0.48.2 h1:U97ZAsRGMVxyQQJEc54RHkZHhb7KnVCVRy/9aYC/VII= -github.com/aperturerobotics/controllerbus v0.48.2/go.mod h1:W0Z/zh2LRWpDyTCtytohiG4xvaRiI9OAzfW4pvp5G9E= +github.com/aperturerobotics/controllerbus v0.49.0 h1:SgY2DOWhVb4A835tfWH14tjtziwTtaG1oqtiiZtcKJE= +github.com/aperturerobotics/controllerbus v0.49.0/go.mod h1:kBXmuNACfNpv/eFuVAiP42w83DsRSMBBaEQtD1yT2rg= github.com/aperturerobotics/entitygraph v0.10.1 h1:ShiCCeW4NtGo+TfMfP21mHCdvPoKW/1N27KXw4elGk0= github.com/aperturerobotics/entitygraph v0.10.1/go.mod h1:Cg1SNQFmTXo0TSfnouHrPZis2wgZSEgkpIyeld0loRg= github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:tGwbeDoEeQCrUQL+ClUywldqvz9eRmhcVrGwGxz2xJg= @@ -28,12 +28,10 @@ github.com/aperturerobotics/quic-go v0.48.2-0.20241029082227-fa76c393ee89 h1:MUX github.com/aperturerobotics/quic-go v0.48.2-0.20241029082227-fa76c393ee89/go.mod h1:vhhkHYq2i9lb0bOllqKhOdtg/3i7r4o/7zc8XI/T4lo= github.com/aperturerobotics/starpc v0.36.1 h1:10z0U0gPsXbT6eHGExa/oblWwWSC4yO39T6fdDpsKL4= github.com/aperturerobotics/starpc v0.36.1/go.mod h1:VOTQt8NRyo+HbcTpf+YAonYU4gofyPZyYsX/B9NUpj8= -github.com/aperturerobotics/util v1.27.0 h1:nNFFOQo1NcSfcMPjnzoqxOd7EXdTzLiCNugOm9aarHc= -github.com/aperturerobotics/util v1.27.0/go.mod h1:8u36NK8OBQM2qxoRU7VVCfiiP5EJ+oV3gHsmnhQoPEY= +github.com/aperturerobotics/util v1.27.1 h1:htCjY/HvP8DusRxWiCFEbm8lMz7HzJSovdhSzVcrtuI= +github.com/aperturerobotics/util v1.27.1/go.mod h1:hurmxv5jC2CqkfhgySRYrXDcvqPk6BHUhHizu6yyXhE= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= -github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/coder/websocket v1.8.13-0.20241204191143-11bda985bf5f h1:7Yh9WzYAcDbxlUUEDma4nVMi5p4adbQxiuhtbV/MtDw= github.com/coder/websocket v1.8.13-0.20241204191143-11bda985bf5f/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc= diff --git a/rpc/access/client-controller.go b/rpc/access/client-controller.go index cf7dd631..39a1a1e0 100644 --- a/rpc/access/client-controller.go +++ b/rpc/access/client-controller.go @@ -9,7 +9,7 @@ import ( "github.com/aperturerobotics/controllerbus/controller" "github.com/aperturerobotics/controllerbus/directive" "github.com/aperturerobotics/util/refcount" - "github.com/cenkalti/backoff/v4" + "github.com/aperturerobotics/util/backoff/cbackoff" "github.com/sirupsen/logrus" ) diff --git a/signaling/rpc/client/client.go b/signaling/rpc/client/client.go index 70540e70..c2450e5f 100644 --- a/signaling/rpc/client/client.go +++ b/signaling/rpc/client/client.go @@ -14,7 +14,7 @@ import ( "github.com/aperturerobotics/util/broadcast" "github.com/aperturerobotics/util/keyed" "github.com/aperturerobotics/util/routine" - cbackoff "github.com/cenkalti/backoff/v4" + cbackoff "github.com/aperturerobotics/util/backoff/cbackoff" "github.com/libp2p/go-libp2p/core/crypto" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/signaling/rpc/client/controller.go b/signaling/rpc/client/controller.go index e5cf838e..5d3acc40 100644 --- a/signaling/rpc/client/controller.go +++ b/signaling/rpc/client/controller.go @@ -13,7 +13,7 @@ import ( "github.com/aperturerobotics/util/ccontainer" "github.com/aperturerobotics/util/keyed" "github.com/blang/semver/v4" - cbackoff "github.com/cenkalti/backoff/v4" + cbackoff "github.com/aperturerobotics/util/backoff/cbackoff" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/transport/common/dialer/dialer.go b/transport/common/dialer/dialer.go index 003ba6eb..2debe9b1 100644 --- a/transport/common/dialer/dialer.go +++ b/transport/common/dialer/dialer.go @@ -7,7 +7,7 @@ import ( "github.com/aperturerobotics/bifrost/link" "github.com/aperturerobotics/bifrost/peer" - bo "github.com/cenkalti/backoff/v4" + bo "github.com/aperturerobotics/util/backoff/cbackoff" "github.com/sirupsen/logrus" ) diff --git a/transport/webrtc/webrtc.go b/transport/webrtc/webrtc.go index f9969f86..c22f52eb 100644 --- a/transport/webrtc/webrtc.go +++ b/transport/webrtc/webrtc.go @@ -17,7 +17,7 @@ import ( "github.com/aperturerobotics/util/broadcast" "github.com/aperturerobotics/util/keyed" "github.com/blang/semver/v4" - cbackoff "github.com/cenkalti/backoff/v4" + cbackoff "github.com/aperturerobotics/util/backoff/cbackoff" "github.com/libp2p/go-libp2p/core/crypto" p2ptls "github.com/libp2p/go-libp2p/p2p/security/tls" "github.com/pion/webrtc/v4"