Merge pull request #83 from smartcontractkit/chore/fixImport

Chore/fix import

Author: kalverra

explorer/dht.pb.go

@@ -3,11 +3,11 @@ package explorer
 // original pb https://github.com/smartcontractkit/libocr/blob/master/networking/dht-router/serialization/cl_dht_addr_announcement.pb.go
 
 import (
-	proto "github.com/golang/protobuf/proto"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (
@@ -17,10 +17,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type SignedAnnouncement struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

explorer/explorer.go

@@ -2,11 +2,12 @@ package explorer
 
 import (
 	"encoding/json"
-	"github.com/golang/protobuf/proto"
-	"github.com/gorilla/websocket"
-	"github.com/rs/zerolog/log"
 	"net/http"
 	"sync"
+
+	"github.com/gorilla/websocket"
+	"github.com/rs/zerolog/log"
+	"google.golang.org/protobuf/proto"
 )
 
 const (
@@ -141,7 +142,7 @@ func (e *Explorer) tryUnmarshalDHT(bs []byte, foundFlag *bool) {
 	switch {
 	case msg.GetAddrs() != nil:
 		*foundFlag = true
-		log.Debug().Interface("DHT Announce", msg).Send()
+		log.Debug().Interface("DHT Announce", msg.ProtoReflect()).Send()
 		e.Messages.DHTAnnounce = append(e.Messages.DHTAnnounce, &msg)
 	}
 }

explorer/go.mod

@@ -6,7 +6,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -18,10 +17,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type MessageNewEpoch struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

explorer/messages.pb.go

@@ -6,7 +6,6 @@ import (
 	reflect "reflect"
 	sync "sync"
 
-	proto "github.com/golang/protobuf/proto"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -18,10 +17,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// This is a compile-time assertion that a sufficiently up-to-date version
-// of the legacy proto package is being used.
-const _ = proto.ProtoPackageIsVersion4
-
 type TelemetryWrapper struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache

explorer/telemetry.pb.go

@@ -4,27 +4,26 @@ go 1.16
 
 require (
 	github.com/avast/retry-go v3.0.0+incompatible
-	github.com/ethereum/go-ethereum v1.10.4
+	github.com/ethereum/go-ethereum v1.10.8
 	github.com/ghodss/yaml v1.0.0
 	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/google/go-github v17.0.0+incompatible
+	github.com/gorilla/websocket v1.4.2
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/montanaflynn/stats v0.6.6
 	github.com/onsi/ginkgo v1.16.4
-	github.com/onsi/gomega v1.13.0
+	github.com/onsi/gomega v1.16.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.8.0
 	github.com/prometheus/common v0.14.0
 	github.com/rs/zerolog v1.21.0
 	github.com/satori/go.uuid v1.2.0
-	github.com/smartcontractkit/integrations-framework/explorer v0.0.0
 	github.com/smartcontractkit/libocr v0.0.0-20210803133922-ddddd3dce7e5
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.8.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	google.golang.org/protobuf v1.26.0
 	k8s.io/api v0.22.0
 	k8s.io/apimachinery v0.22.0
 	k8s.io/client-go v0.22.0
 )
-
-replace github.com/smartcontractkit/integrations-framework/explorer => ./explorer/