From 6165b71cf7494c004798dd1e985ba30be23cf714 Mon Sep 17 00:00:00 2001 From: Jonathan Chappelow Date: Tue, 30 Mar 2021 17:13:05 -0500 Subject: [PATCH] update chi for fixes to SIV snafu and a data race This updates to chi/v5, which is the same as v1.5.4, just with proper semantic import versioning (SIV). The project conceded the 1.5.x approach did not work out since latest was previously v4. This also pulls in a chi data race fix in v1.5.2. --- client/rpcserver/rpcserver.go | 4 ++-- client/webserver/middleware.go | 2 +- client/webserver/webserver.go | 4 ++-- client/webserver/webserver_test.go | 2 +- dex/testing/loadbot/go.sum | 13 +++++++------ go.mod | 2 +- go.sum | 4 ++-- server/admin/api.go | 2 +- server/admin/server.go | 4 ++-- server/admin/server_test.go | 2 +- server/comms/middleware.go | 2 +- server/comms/server.go | 4 ++-- 12 files changed, 23 insertions(+), 22 deletions(-) diff --git a/client/rpcserver/rpcserver.go b/client/rpcserver/rpcserver.go index 6603034ec8..66121b33b2 100644 --- a/client/rpcserver/rpcserver.go +++ b/client/rpcserver/rpcserver.go @@ -26,8 +26,8 @@ import ( "decred.org/dcrdex/dex" "decred.org/dcrdex/dex/msgjson" "github.com/decred/dcrd/certgen" - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" ) const ( diff --git a/client/webserver/middleware.go b/client/webserver/middleware.go index 92f6db57f6..f984e1eb85 100644 --- a/client/webserver/middleware.go +++ b/client/webserver/middleware.go @@ -12,7 +12,7 @@ import ( "decred.org/dcrdex/dex" "decred.org/dcrdex/dex/order" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" ) type ctxID int diff --git a/client/webserver/webserver.go b/client/webserver/webserver.go index 7313d57e24..4f10415c49 100644 --- a/client/webserver/webserver.go +++ b/client/webserver/webserver.go @@ -24,8 +24,8 @@ import ( "decred.org/dcrdex/client/core" "decred.org/dcrdex/client/websocket" "decred.org/dcrdex/dex" - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" ) // contextKey is the key param type used when saving values to a context using diff --git a/client/webserver/webserver_test.go b/client/webserver/webserver_test.go index 6c7a6b0f92..a7b06e22fe 100644 --- a/client/webserver/webserver_test.go +++ b/client/webserver/webserver_test.go @@ -21,7 +21,7 @@ import ( "decred.org/dcrdex/dex" "decred.org/dcrdex/dex/encode" "decred.org/dcrdex/dex/order" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" ) var ( diff --git a/dex/testing/loadbot/go.sum b/dex/testing/loadbot/go.sum index ddad5c3460..99b8466c87 100644 --- a/dex/testing/loadbot/go.sum +++ b/dex/testing/loadbot/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= decred.org/cspp v0.3.0/go.mod h1:UygjYilC94dER3BEU65Zzyoqy9ngJfWCD2rdJqvUs2A= -decred.org/dcrwallet v1.6.0-rc4 h1:5IT6mFa+2YMqenu6aE2LetD0N8QSUVFyAFl205PvIIE= -decred.org/dcrwallet v1.6.0-rc4/go.mod h1:lsrNbuKxkPGeHXPufxNTckwQopCEDz0r3t0a8JCKAmU= +decred.org/dcrwallet v1.6.3-0.20210324151833-873c564976fd h1:tAaRGZmA8aj0F88oeFGhNXjtoV29E/jbuTYjVEVYU14= +decred.org/dcrwallet v1.6.3-0.20210324151833-873c564976fd/go.mod h1:hNOGyvH53gWdgFB601/ubGRzCPfPtWnEVAi9Grs90y4= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OpenBazaar/jsonpb v0.0.0-20171123000858-37d32ddf4eef/go.mod h1:55mCznBcN9WQgrtgaAkv+p2LxeW/tQRdidyyE9D0I5k= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= @@ -99,8 +99,8 @@ github.com/gcash/bchutil v0.0.0-20190625002603-800e62fe9aff/go.mod h1:zXSP0Fg2L5 github.com/gcash/bchutil v0.0.0-20191012211144-98e73ec336ba/go.mod h1:nUIrcbbtEQdCsRwcp+j/CndDKMQE9Fi8p2F8cIZmIqI= github.com/gcash/bchutil v0.0.0-20200506001747-c2894cd54b33/go.mod h1:wB++2ZcHUvGLN1OgO9swBmJK1vmyshJLW9SNS+apXwc= github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000/go.mod h1:H2USFGwtiu6CNMxiVQPqZkDzsoVSt9BLNqTfBBqGXRo= -github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w= -github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= +github.com/go-chi/chi/v5 v5.0.1 h1:ALxjCrTf1aflOlkhMnCUP86MubbWFrzB3gkRPReLpTo= +github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -196,7 +196,6 @@ golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= @@ -243,9 +242,11 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201022201747-fb209a7c41cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5 h1:iCaAy5bMeEvwANu3YnJfWwI0kWAGkEa2RXPdweI/ysk= golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= diff --git a/go.mod b/go.mod index ea3f6ead1e..a91990eba4 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/decred/slog v1.1.0 github.com/gcash/bchd v0.17.2-0.20201218180520-5708823e0e99 github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 - github.com/go-chi/chi v1.5.1 + github.com/go-chi/chi/v5 v5.0.1 github.com/gorilla/websocket v1.4.2 github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7 github.com/jrick/logrotate v1.0.0 diff --git a/go.sum b/go.sum index de07539d0b..3f32a5b052 100644 --- a/go.sum +++ b/go.sum @@ -102,8 +102,8 @@ github.com/gcash/bchutil v0.0.0-20191012211144-98e73ec336ba/go.mod h1:nUIrcbbtEQ github.com/gcash/bchutil v0.0.0-20200506001747-c2894cd54b33/go.mod h1:wB++2ZcHUvGLN1OgO9swBmJK1vmyshJLW9SNS+apXwc= github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 h1:vVi7Ym3I9T4ZKhQy0/XLKzS3xAqX4K+/cSAmnvMR+HM= github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000/go.mod h1:H2USFGwtiu6CNMxiVQPqZkDzsoVSt9BLNqTfBBqGXRo= -github.com/go-chi/chi v1.5.1 h1:kfTK3Cxd/dkMu/rKs5ZceWYp+t5CtiE7vmaTv3LjC6w= -github.com/go-chi/chi v1.5.1/go.mod h1:REp24E+25iKvxgeTfHmdUoL5x15kBiDBlnIl5bCwe2k= +github.com/go-chi/chi/v5 v5.0.1 h1:ALxjCrTf1aflOlkhMnCUP86MubbWFrzB3gkRPReLpTo= +github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= diff --git a/server/admin/api.go b/server/admin/api.go index 0b1701dd1c..5b423d8184 100644 --- a/server/admin/api.go +++ b/server/admin/api.go @@ -20,7 +20,7 @@ import ( "decred.org/dcrdex/dex/order" "decred.org/dcrdex/server/account" "decred.org/dcrdex/server/market" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" ) const ( diff --git a/server/admin/server.go b/server/admin/server.go index af78e8f6d1..dd343bf67b 100644 --- a/server/admin/server.go +++ b/server/admin/server.go @@ -25,8 +25,8 @@ import ( "decred.org/dcrdex/server/db" "decred.org/dcrdex/server/market" "github.com/decred/slog" - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" ) const ( diff --git a/server/admin/server_test.go b/server/admin/server_test.go index 4216b6d6b0..948b0abad8 100644 --- a/server/admin/server_test.go +++ b/server/admin/server_test.go @@ -34,7 +34,7 @@ import ( "decred.org/dcrdex/server/market" "github.com/decred/dcrd/certgen" "github.com/decred/slog" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" ) func init() { diff --git a/server/comms/middleware.go b/server/comms/middleware.go index 478013e182..4133611a9a 100644 --- a/server/comms/middleware.go +++ b/server/comms/middleware.go @@ -13,7 +13,7 @@ import ( "decred.org/dcrdex/dex" "decred.org/dcrdex/dex/msgjson" - "github.com/go-chi/chi" + "github.com/go-chi/chi/v5" ) type contextKey int diff --git a/server/comms/server.go b/server/comms/server.go index e904a80838..8e5537f0c1 100644 --- a/server/comms/server.go +++ b/server/comms/server.go @@ -23,8 +23,8 @@ import ( "decred.org/dcrdex/dex/msgjson" "decred.org/dcrdex/dex/ws" "github.com/decred/dcrd/certgen" - "github.com/go-chi/chi" - "github.com/go-chi/chi/middleware" + "github.com/go-chi/chi/v5" + "github.com/go-chi/chi/v5/middleware" "golang.org/x/time/rate" )