fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-28 12:11:44 +00:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Anton Kaliaev
2018-01-23 13:11:44 +04:00
parent 161e100a24
commit 747b73cb95
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
p2p/switch_test.go
View File

@ -301,7 +301,7 @@ func TestSwitchFullConnectivity(t *testing.T) {
}
func BenchmarkSwitchBroadcast(b *testing.B) {
s1, s2 := makeSwitchPair(b, func(i int, sw *Switch) *Switch {
s1, s2 := MakeSwitchPair(b, func(i int, sw *Switch) *Switch {
// Make bar reactors of bar channels each
sw.AddReactor("foo", NewTestReactor([]*conn.ChannelDescriptor{
{ID: byte(0x00), Priority: 10},