From 955175b7eb7c091e3fa7d97b62ea97b8ea4159e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Kapka?= Date: Mon, 31 Jul 2023 17:51:19 +0200 Subject: [PATCH] Update server-side events dependency (#12676) * Update server-side events dependency * go sum --------- Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> --- beacon-chain/rpc/apimiddleware/BUILD.bazel | 4 ++-- beacon-chain/rpc/apimiddleware/custom_handlers.go | 2 +- beacon-chain/rpc/apimiddleware/custom_handlers_test.go | 2 +- deps.bzl | 9 ++++----- go.mod | 2 +- go.sum | 4 ++-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/beacon-chain/rpc/apimiddleware/BUILD.bazel b/beacon-chain/rpc/apimiddleware/BUILD.bazel index d3fd05d2b..3a62eec0e 100644 --- a/beacon-chain/rpc/apimiddleware/BUILD.bazel +++ b/beacon-chain/rpc/apimiddleware/BUILD.bazel @@ -23,7 +23,7 @@ go_library( "//runtime/version:go_default_library", "//time/slots:go_default_library", "@com_github_pkg_errors//:go_default_library", - "@com_github_r3labs_sse//:go_default_library", + "@com_github_r3labs_sse_v2//:go_default_library", ], ) @@ -46,6 +46,6 @@ go_test( "//testing/require:go_default_library", "//time/slots:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", - "@com_github_r3labs_sse//:go_default_library", + "@com_github_r3labs_sse_v2//:go_default_library", ], ) diff --git a/beacon-chain/rpc/apimiddleware/custom_handlers.go b/beacon-chain/rpc/apimiddleware/custom_handlers.go index 57293a50c..753512ec5 100644 --- a/beacon-chain/rpc/apimiddleware/custom_handlers.go +++ b/beacon-chain/rpc/apimiddleware/custom_handlers.go @@ -17,7 +17,7 @@ import ( "github.com/prysmaticlabs/prysm/v4/api/grpc" "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/events" "github.com/prysmaticlabs/prysm/v4/runtime/version" - "github.com/r3labs/sse" + "github.com/r3labs/sse/v2" ) // match a number with optional decimals diff --git a/beacon-chain/rpc/apimiddleware/custom_handlers_test.go b/beacon-chain/rpc/apimiddleware/custom_handlers_test.go index 2d830f71c..1703dac35 100644 --- a/beacon-chain/rpc/apimiddleware/custom_handlers_test.go +++ b/beacon-chain/rpc/apimiddleware/custom_handlers_test.go @@ -17,7 +17,7 @@ import ( "github.com/prysmaticlabs/prysm/v4/beacon-chain/rpc/eth/events" "github.com/prysmaticlabs/prysm/v4/testing/assert" "github.com/prysmaticlabs/prysm/v4/testing/require" - "github.com/r3labs/sse" + "github.com/r3labs/sse/v2" ) type testSSZResponseJson struct { diff --git a/deps.bzl b/deps.bzl index 9d425ffd8..a8b65aa6e 100644 --- a/deps.bzl +++ b/deps.bzl @@ -3394,12 +3394,11 @@ def prysm_deps(): sum = "h1:GA6Bl6oZY+g/flt00Pnu0XtivSD8vukOu3lYhJjnGEk=", version = "v0.5.2", ) - go_repository( - name = "com_github_r3labs_sse", - importpath = "github.com/r3labs/sse", - sum = "h1:zAsgcP8MhzAbhMnB1QQ2O7ZhWYVGYSR2iVcjzQuPV+o=", - version = "v0.0.0-20210224172625-26fe804710bc", + name = "com_github_r3labs_sse_v2", + importpath = "github.com/r3labs/sse/v2", + sum = "h1:hFEkLLFY4LDifoHdiCN/LlGBAdVJYsANaLqNYa1l/v0=", + version = "v2.10.0", ) go_repository( diff --git a/go.mod b/go.mod index dfbef6542..94d8fcf11 100644 --- a/go.mod +++ b/go.mod @@ -62,7 +62,7 @@ require ( github.com/prysmaticlabs/go-bitfield v0.0.0-20210809151128-385d8c5e3fb7 github.com/prysmaticlabs/prombbolt v0.0.0-20210126082820-9b7adba6db7c github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20230228205207-28762a7b9294 - github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc + github.com/r3labs/sse/v2 v2.10.0 github.com/rs/cors v1.7.0 github.com/schollz/progressbar/v3 v3.3.4 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 52a9d8668..e83e6f643 100644 --- a/go.sum +++ b/go.sum @@ -1085,8 +1085,8 @@ github.com/quic-go/quic-go v0.33.0 h1:ItNoTDN/Fm/zBlq769lLJc8ECe9gYaW40veHCCco7y github.com/quic-go/quic-go v0.33.0/go.mod h1:YMuhaAV9/jIu0XclDXwZPAsP/2Kgr5yMYhe9oxhhOFA= github.com/quic-go/webtransport-go v0.5.2 h1:GA6Bl6oZY+g/flt00Pnu0XtivSD8vukOu3lYhJjnGEk= github.com/quic-go/webtransport-go v0.5.2/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU= -github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc h1:zAsgcP8MhzAbhMnB1QQ2O7ZhWYVGYSR2iVcjzQuPV+o= -github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc/go.mod h1:S8xSOnV3CgpNrWd0GQ/OoQfMtlg2uPRSuTzcSGrzwK8= +github.com/r3labs/sse/v2 v2.10.0 h1:hFEkLLFY4LDifoHdiCN/LlGBAdVJYsANaLqNYa1l/v0= +github.com/r3labs/sse/v2 v2.10.0/go.mod h1:Igau6Whc+F17QUgML1fYe1VPZzTV6EMCnYktEmkNJ7I= github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk= github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=