Merge pull request #554 from LeoHChen/build_fix_after_bls_update

[build] fix build error after update of bls
pull/550/head
Leo Chen 6 years ago committed by GitHub
commit b86e6e68cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      api/proto/node/node.go
  2. 5
      api/proto/node/node_test.go
  3. 2
      go.mod

@ -86,7 +86,7 @@ type Info struct {
} }
func (info Info) String() string { func (info Info) String() string {
return fmt.Sprintf("Info:%v/%v=>%v/%v", info.IP, info.Port, info.ValidatorID, info.PeerID) return fmt.Sprintf("Info:%v/%v=>%v/%v", info.IP, info.Port, info.ValidatorID, info.PeerID.Pretty())
} }
// BlockMessageType represents the type of messages used for Node/Block // BlockMessageType represents the type of messages used for Node/Block

@ -10,7 +10,6 @@ import (
"github.com/harmony-one/harmony/core/state" "github.com/harmony-one/harmony/core/state"
"github.com/harmony-one/harmony/core/types" "github.com/harmony-one/harmony/core/types"
// "fmt"
"math/big" "math/big"
"reflect" "reflect"
"testing" "testing"
@ -131,7 +130,7 @@ func TestInfoToString(t *testing.T) {
ValidatorID: 1, ValidatorID: 1,
PeerID: "peer", PeerID: "peer",
} }
if strings.Compare(info.String(), "Info:127.0.0.1/81=>1/<peer.ID 3sdfvR>") != 0 { if strings.Compare(info.String(), "Info:127.0.0.1/81=>1/3sdfvR") != 0 {
t.Error("Info string mismatch") t.Errorf("Info string mismatch: %v", info.String())
} }
} }

@ -22,7 +22,7 @@ require (
github.com/gorilla/mux v1.7.0 github.com/gorilla/mux v1.7.0
github.com/gorilla/websocket v1.4.0 // indirect github.com/gorilla/websocket v1.4.0 // indirect
github.com/gxed/hashland v0.0.1 github.com/gxed/hashland v0.0.1
github.com/harmony-one/bls v0.0.0-20190220064443-3c0ae384f04f github.com/harmony-one/bls v0.0.0-20190309234102-1bd75ac96c09
github.com/hashicorp/golang-lru v0.5.0 github.com/hashicorp/golang-lru v0.5.0
github.com/ipfs/go-cid v0.9.0 // indirect github.com/ipfs/go-cid v0.9.0 // indirect
github.com/ipfs/go-datastore v3.2.0+incompatible github.com/ipfs/go-datastore v3.2.0+incompatible

Loading…
Cancel
Save