From 2970eb21ecf400bd4862a6a53062eedde52c0138 Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Mon, 23 Jul 2018 09:40:42 +0800 Subject: simulation: fix tcp-local network simulation (#8) * simulation: fix tcp-local network simulation * fixup --- simulation/peer-server.go | 2 +- simulation/tcp-network.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'simulation') diff --git a/simulation/peer-server.go b/simulation/peer-server.go index 4a74fb7..90bcf33 100644 --- a/simulation/peer-server.go +++ b/simulation/peer-server.go @@ -68,7 +68,7 @@ func (p *PeerServer) Run(configPath string) { defer p.peersMu.Unlock() host, _, _ := net.SplitHostPort(r.RemoteAddr) - p.peers[id] = fmt.Sprintf("%s:%s", host, portString) + p.peers[id] = net.JoinHostPort(host, portString) log.Printf("Peer %s joined from %s", id, p.peers[id]) } diff --git a/simulation/tcp-network.go b/simulation/tcp-network.go index 7640480..02475e1 100644 --- a/simulation/tcp-network.go +++ b/simulation/tcp-network.go @@ -50,9 +50,13 @@ func NewTCPNetwork(local bool, peerServer string) *TCPNetwork { if !local { port = peerPort } + pServer := peerServer + if local { + pServer = "localhost" + } return &TCPNetwork{ local: local, - peerServer: peerServer, + peerServer: pServer, port: port, endpoints: make(map[types.ValidatorID]string), recieveChan: make(chan interface{}, msgBufferSize), -- cgit v1.2.3