fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-07-31 20:21:56 +00:00
Code Issues Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Ethan Buchman
2017-11-15 22:03:20 +00:00
parent 104368bd84
commit af0db599b0
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/switch.go
View File

@@ -507,8 +507,6 @@ func MakeConnectedSwitches(cfg *cfg.P2PConfig, n int, initSwitch func(int, *Swit
return switches return switches
} }
var PanicOnAddPeerErr = false
// Connect2Switches will connect switches i and j via net.Pipe(). // Connect2Switches will connect switches i and j via net.Pipe().
// Blocks until a conection is established. // Blocks until a conection is established.
// NOTE: caller ensures i and j are within bounds. // NOTE: caller ensures i and j are within bounds.
@@ -519,14 +517,14 @@ func Connect2Switches(switches []*Switch, i, j int) {
doneCh := make(chan struct{}) doneCh := make(chan struct{})
go func() { go func() {
err := switchI.addPeerWithConnection(c1) err := switchI.addPeerWithConnection(c1)
if PanicOnAddPeerErr && err != nil { if err != nil {
panic(err) panic(err)
} }
doneCh <- struct{}{} doneCh <- struct{}{}
}() }()
go func() { go func() {
err := switchJ.addPeerWithConnection(c2) err := switchJ.addPeerWithConnection(c2)
if PanicOnAddPeerErr && err != nil { if err != nil {
panic(err) panic(err)
} }
doneCh <- struct{}{} doneCh <- struct{}{}

2
rpc/lib/types/types.go
View File

@@ -97,7 +97,7 @@ func NewRPCErrorResponse(id string, code int, msg string, data string) RPCRespon
} }
func (resp RPCResponse) String() string { func (resp RPCResponse) String() string {
if resp.Error != nil { if resp.Error == nil {
return fmt.Sprintf("[%s %v]", resp.ID, resp.Result) return fmt.Sprintf("[%s %v]", resp.ID, resp.Result)
} else { } else {
return fmt.Sprintf("[%s %s]", resp.ID, resp.Error) return fmt.Sprintf("[%s %s]", resp.ID, resp.Error)