Pierre Krieger authored Mar 23, 2019 and Arkadiy Paronyan committed Mar 23, 2019

* Replace NodeIndex with PeerId

* Fix tests

* More test fixing

* Whitespace