Skip to content

Commit

Permalink
Use google.golang.org/grpc v1.33.2 to be compatible with cosmos-sdk (c…
Browse files Browse the repository at this point in the history
…osmos#315)

* Use google.golang.org/grpc v1.33.2 to be compatible with cosmos-sdk
* docs: update CHANGELOG-PENDING.md

Co-authored-by: Tomasz Zdybał <tomek@zdybal.lap.pl>
  • Loading branch information
jbowen93 and tzdybal authored Mar 8, 2022
1 parent 743746a commit 9fb4d0f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 145 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG-PENDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
### IMPROVEMENTS

### BUG FIXES
- fix: make TestValidatorSetHandling even more stable ([#314](https://github.com/celestiaorg/optimint/pull/314)) [@tzdybal](https://github.com/tzdybal/)
- Use google.golang.org/grpc v1.33.2 to be compatible with cosmos-sdk ([#315](https://github.com/celestiaorg/optimint/pull/315)) [@jbowen93](https://github.com/jbowen93/)
- Make TestValidatorSetHandling even more stable ([#314](https://github.com/celestiaorg/optimint/pull/314)) [@tzdybal](https://github.com/tzdybal/)
3 changes: 1 addition & 2 deletions da/grpc/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"strconv"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/celestiaorg/optimint/da"
"github.com/celestiaorg/optimint/log"
Expand Down Expand Up @@ -52,7 +51,7 @@ func (d *DataAvailabilityLayerClient) Start() error {
var err error
var opts []grpc.DialOption
// TODO(tzdybal): add more options
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
opts = append(opts, grpc.WithInsecure())
d.conn, err = grpc.Dial(d.config.Host+":"+strconv.Itoa(d.config.Port), opts...)
if err != nil {
return err
Expand Down
9 changes: 6 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ require (
github.com/golang/protobuf v1.5.2
github.com/google/orderedcode v0.0.1
github.com/gorilla/rpc v1.2.0
github.com/gorilla/websocket v1.4.2
github.com/ipfs/go-log v1.0.5
github.com/libp2p/go-libp2p v0.15.1
github.com/libp2p/go-libp2p-core v0.9.0
github.com/libp2p/go-libp2p-discovery v0.5.1
github.com/libp2p/go-libp2p-kad-dht v0.15.0
github.com/libp2p/go-libp2p-pubsub v0.5.6
github.com/minio/sha256-simd v1.0.0
github.com/multiformats/go-multiaddr v0.5.0
github.com/prometheus/client_golang v1.12.1
github.com/rs/cors v1.8.2
Expand Down Expand Up @@ -54,7 +54,6 @@ require (
github.com/google/gopacket v1.1.19 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down Expand Up @@ -123,6 +122,7 @@ require (
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
github.com/minio/sha256-simd v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mr-tron/base58 v1.2.0 // indirect
github.com/multiformats/go-base32 v0.0.3 // indirect
Expand Down Expand Up @@ -175,4 +175,7 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
replace (
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
Loading

0 comments on commit 9fb4d0f

Please sign in to comment.