Merge pull request #338 from harmony-ek/remove_deprecated_ready_field

Remove deprecated ready field
pull/340/head
Eugene Kim 6 years ago committed by GitHub
commit ba5a72f888
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      api/proto/node/pingpong_test.go
  2. 2
      node/node_test.go
  3. 1
      p2p/p2p.go

@ -30,14 +30,12 @@ var (
IP: "127.0.0.1", IP: "127.0.0.1",
Port: "8888", Port: "8888",
PubKey: pubKey1, PubKey: pubKey1,
Ready: true,
ValidatorID: -1, ValidatorID: -1,
}, },
{ {
IP: "127.0.0.1", IP: "127.0.0.1",
Port: "9999", Port: "9999",
PubKey: pubKey2, PubKey: pubKey2,
Ready: false,
ValidatorID: -2, ValidatorID: -2,
}, },
} }

@ -73,14 +73,12 @@ func TestAddPeers(t *testing.T) {
IP: "127.0.0.1", IP: "127.0.0.1",
Port: "8888", Port: "8888",
PubKey: pubKey1, PubKey: pubKey1,
Ready: true,
ValidatorID: 1, ValidatorID: 1,
}, },
&p2p.Peer{ &p2p.Peer{
IP: "127.0.0.1", IP: "127.0.0.1",
Port: "9999", Port: "9999",
PubKey: pubKey2, PubKey: pubKey2,
Ready: false,
ValidatorID: 2, ValidatorID: 2,
}, },
} }

@ -17,7 +17,6 @@ type Peer struct {
IP string // IP address of the peer IP string // IP address of the peer
Port string // Port number of the peer Port string // Port number of the peer
PubKey *bls.PublicKey // Public key of the peer, used for consensus signing PubKey *bls.PublicKey // Public key of the peer, used for consensus signing
Ready bool // Ready is true if the peer is ready to join consensus. (FIXME: deprecated)
ValidatorID int // -1 is the default value, means not assigned any validator ID in the shard ValidatorID int // -1 is the default value, means not assigned any validator ID in the shard
Addrs []multiaddr.Multiaddr // MultiAddress of the peer Addrs []multiaddr.Multiaddr // MultiAddress of the peer
PeerID peer.ID // PeerID, the pubkey for communication PeerID peer.ID // PeerID, the pubkey for communication

Loading…
Cancel
Save