Replaced NodeInfo's pubkey to ID by eeonevision · Pull Request #1443 · tendermint/tendermint

eeonevision · 2018-04-09T17:41:46Z

Updated all relevant documentation in docs
Updated all code comments where relevant
Wrote tests
Updated CHANGELOG.md

melekes · 2018-04-10T09:39:30Z

benchmarks/codec_test.go

 	cdc := amino.NewCodec()
 	ctypes.RegisterAmino(cdc)
-	pubKey := crypto.GenPrivKeyEd25519().PubKey()
+	crypto.GenPrivKeyEd25519()


melekes · 2018-04-10T09:40:41Z

benchmarks/codec_test.go

-		ListenAddr: "SOMEADDR",
-		Version:    "SOMEVER",
-		Other:      []string{"SOMESTRING", "OTHERSTRING"},
+		Id:         &proto.ID{Id: &nodeID},


what's up with all these pointers? can't we just use strings?

No because generated proto.go file have *string type for above fields.
Define just "SOME" string leads to error: "cannot use * (type string) as type *string in field value"

melekes · 2018-04-10T09:41:50Z

benchmarks/proto/test.proto

 }

+message ID {
+  optional string id = 1;


melekes · 2018-04-10T09:42:26Z

node/node.go

 }

-func (n *Node) makeNodeInfo(pubKey crypto.PubKey) p2p.NodeInfo {
+func (n *Node) makeNodeInfo(nodeID p2p.ID) p2p.NodeInfo {


there will some confusion, what ID we need to use. nodeID explicitly defines, which ID need to send in argument.

melekes · 2018-04-10T13:59:55Z

Could you please rebase against latest develop? I fixed the data race (test_cover).

Refs tendermint#1429

Closes tendermint#1442 ``` WARNING: DATA RACE Write at 0x00c4209de7c8 by goroutine 23: github.com/tendermint/tendermint/types.(*Block).fillHeader() /home/vagrant/go/src/github.com/tendermint/tendermint/types/block.go:88 +0x157 github.com/tendermint/tendermint/types.(*Block).Hash() /home/vagrant/go/src/github.com/tendermint/tendermint/types/block.go:104 +0x121 github.com/tendermint/tendermint/types.(*Block).HashesTo() /home/vagrant/go/src/github.com/tendermint/tendermint/types/block.go:135 +0x4f github.com/tendermint/tendermint/consensus.(*ConsensusState).enterPrecommit() /home/vagrant/go/src/github.com/tendermint/tendermint/consensus/state.go:1037 +0x182d github.com/tendermint/tendermint/consensus.(*ConsensusState).addVote() /home/vagrant/go/src/github.com/tendermint/tendermint/consensus/state.go:1425 +0x1a6c github.com/tendermint/tendermint/consensus.(*ConsensusState).tryAddVote() /home/vagrant/go/src/github.com/tendermint/tendermint/consensus/state.go:1318 +0x77 github.com/tendermint/tendermint/consensus.(*ConsensusState).handleMsg() /home/vagrant/go/src/github.com/tendermint/tendermint/consensus/state.go:581 +0x7a9 github.com/tendermint/tendermint/consensus.(*ConsensusState).receiveRoutine() /home/vagrant/go/src/github.com/tendermint/tendermint/consensus/state.go:539 +0x6c3 Previous read at 0x00c4209de7c8 by goroutine 47: github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common.(*HexBytes).MarshalJSON() <autogenerated>:1 +0x52 github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.invokeMarshalJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:433 +0x88 github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec)._encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:82 +0x8d2 github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:50 +0x10e github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSONStruct() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:348 +0x539 github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec)._encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:119 +0x83f github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:50 +0x10e github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSONStruct() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:348 +0x539 github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec)._encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:119 +0x83f github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:50 +0x10e github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSONStruct() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:348 +0x539 github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec)._encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:119 +0x83f github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:50 +0x10e github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSONStruct() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:348 +0x539 github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec)._encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:119 +0x83f github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).encodeReflectJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/json-encode.go:50 +0x10e github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino.(*Codec).MarshalJSON() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/go-amino/amino.go:296 +0x182 github.com/tendermint/tendermint/rpc/lib/types.NewRPCSuccessResponse() /home/vagrant/go/src/github.com/tendermint/tendermint/rpc/lib/types/types.go:100 +0x12c github.com/tendermint/tendermint/rpc/lib/server.makeJSONRPCHandler.func1() /home/vagrant/go/src/github.com/tendermint/tendermint/rpc/lib/server/handlers.go:152 +0xab7 net/http.HandlerFunc.ServeHTTP() /usr/lib/go-1.9/src/net/http/server.go:1918 +0x51 net/http.(*ServeMux).ServeHTTP() /usr/lib/go-1.9/src/net/http/server.go:2254 +0xa2 github.com/tendermint/tendermint/rpc/lib/server.RecoverAndLogHandler.func1() /home/vagrant/go/src/github.com/tendermint/tendermint/rpc/lib/server/http_server.go:138 +0x4fa net/http.HandlerFunc.ServeHTTP() /usr/lib/go-1.9/src/net/http/server.go:1918 +0x51 net/http.serverHandler.ServeHTTP() /usr/lib/go-1.9/src/net/http/server.go:2619 +0xbc net/http.(*conn).serve() /usr/lib/go-1.9/src/net/http/server.go:1801 +0x83b Goroutine 23 (running) created at: github.com/tendermint/tendermint/consensus.(*ConsensusState).OnStart() /home/vagrant/go/src/github.com/tendermint/tendermint/consensus/state.go:250 +0x35b github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common.(*BaseService).Start() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common/service.go:130 +0x5fc github.com/tendermint/tendermint/consensus.(*ConsensusReactor).OnStart() /home/vagrant/go/src/github.com/tendermint/tendermint/consensus/reactor.go:69 +0x1b4 github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common.(*BaseService).Start() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common/service.go:130 +0x5fc github.com/tendermint/tendermint/consensus.(*ConsensusReactor).Start() <autogenerated>:1 +0x43 github.com/tendermint/tendermint/p2p.(*Switch).OnStart() /home/vagrant/go/src/github.com/tendermint/tendermint/p2p/switch.go:177 +0x124 github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common.(*BaseService).Start() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common/service.go:130 +0x5fc github.com/tendermint/tendermint/node.(*Node).OnStart() /home/vagrant/go/src/github.com/tendermint/tendermint/node/node.go:416 +0xa1b github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common.(*BaseService).Start() /home/vagrant/go/src/github.com/tendermint/tendermint/vendor/github.com/tendermint/tmlibs/common/service.go:130 +0x5fc github.com/tendermint/tendermint/rpc/test.StartTendermint() /home/vagrant/go/src/github.com/tendermint/tendermint/rpc/test/helpers.go:100 +0x5b github.com/tendermint/tendermint/rpc/client_test.TestMain() /home/vagrant/go/src/github.com/tendermint/tendermint/rpc/client/main_test.go:17 +0x4c main.main() github.com/tendermint/tendermint/rpc/client/_test/_testmain.go:76 +0x1cd Goroutine 47 (running) created at: net/http.(*Server).Serve() /usr/lib/go-1.9/src/net/http/server.go:2720 +0x37c net/http.Serve() /usr/lib/go-1.9/src/net/http/server.go:2323 +0xe2 github.com/tendermint/tendermint/rpc/lib/server.StartHTTPServer.func1() /home/vagrant/go/src/github.com/tendermint/tendermint/rpc/lib/server/http_server.go:35 +0xb3 ```

Refs tendermint#1446 (comment)

* use the tag interface for pubsub. * update tmlibs. * Fix unresolved conflict.

* fix show_node_id * make LoadNodeKey public * make LoadNodeKey public * remove if * remove if

…to upstream

melekes · 2018-04-11T09:39:54Z

🥇 🏎 🍰

eeonevision added 17 commits April 6, 2018 20:49

Replaced NodeInfo PubKey to NodeID

858a144

Merge branch 'develop' into master

59a21fe

Merge remote-tracking branch 'upstream/master'

cf9e7eb

Fixed tests and replaced NodeID with ID

9f84daa

Removed unnecessary method ID()

9e618b6

Fixed codec_test.go

f5c9924

Fixed codec_test.go

5f5311d

Removed unnecessary bracket

8933041

Fixed all tests

c676dc4

Fixed peer_set_test.go

b81cc25

Fixed peer_test.go

0fa80f0

Fixed common_test.go

ded43c4

Fixed common_test.go

0a0712a

Renamed node_id to id

541e4e8

Removed peer.ID() from RPC net.go

c35af44

Merge branch 'develop' into master

83ad445

Replaced NodeInfo pubKey to ID

951e6be

eeonevision requested review from ebuchman and melekes as code owners April 9, 2018 17:41

eeonevision mentioned this pull request Apr 9, 2018

Replaced NodeInfo PubKey to NodeID #1430

Closed

4 tasks

eeonevision added 3 commits April 9, 2018 21:02

Fixed codec_test.go

e9f22dc

Fixed peer_set_test.go

dfba1ed

Fix pex_reactor_test.go

ece3ed5

eeonevision mentioned this pull request Apr 9, 2018

Replace peer pubKey info with nodeID #1435

Closed

eeonevision added 2 commits April 10, 2018 11:22

Refactored code for privateKey initiali

b0f1d1d

Fixed peer_set_test.go

ce07522

melekes reviewed Apr 10, 2018

View reviewed changes

eeonevision added 2 commits April 10, 2018 13:00

Fixed test.proto and removed orphan string in codec_test.go

e725174

Fixed pointer to a string

c4c2ead

melekes approved these changes Apr 10, 2018

View reviewed changes

melekes and others added 9 commits April 10, 2018 17:58

generate node_key when running tendermint init

bb1bfa0

[docs] prefix IPs with node IDs

9799a4c

Refs tendermint#1429

gen_node_key cmd

682a2a5

[docs/specification/secure-p2p] add a note about config

05f4361

removed excessive comment

cf1dde2

Refs tendermint#1446 (comment)

use the tag interface for pubsub. (tendermint#1438)

e847fb2

* use the tag interface for pubsub. * update tmlibs. * Fix unresolved conflict.

improve show_node_id (tendermint#1433)

c9e5abe

* fix show_node_id * make LoadNodeKey public * make LoadNodeKey public * remove if * remove if

Merge branch 'develop' of https://github.com/tendermint/tendermint in…

c0e0f79

…to upstream

melekes approved these changes Apr 11, 2018

View reviewed changes

melekes merged commit 7c22e47 into tendermint:develop Apr 11, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replaced NodeInfo's pubkey to ID#1443

Replaced NodeInfo's pubkey to ID#1443
melekes merged 33 commits intotendermint:developfrom
eeonevision:master

eeonevision commented Apr 9, 2018

Uh oh!

melekes Apr 10, 2018

Uh oh!

eeonevision Apr 10, 2018

Uh oh!

melekes Apr 10, 2018

Uh oh!

eeonevision Apr 10, 2018 •

edited

Loading

Uh oh!

melekes Apr 10, 2018

Uh oh!

eeonevision Apr 10, 2018

Uh oh!

melekes Apr 10, 2018

Uh oh!

eeonevision Apr 10, 2018

Uh oh!

melekes commented Apr 10, 2018

Uh oh!

melekes commented Apr 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

eeonevision commented Apr 9, 2018

Uh oh!

melekes Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

eeonevision Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

melekes Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

eeonevision Apr 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

melekes Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

eeonevision Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

melekes Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

eeonevision Apr 10, 2018

Choose a reason for hiding this comment

Uh oh!

melekes commented Apr 10, 2018

Uh oh!

melekes commented Apr 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

eeonevision Apr 10, 2018 •

edited

Loading