mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-08-01 04:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
Callum Waters
2022-09-29 17:35:32 +02:00
parent 9c331e42ae
commit 3f1554b429
2 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
abci/example/kvstore/kvstore_test.go
+9 -39
View File
@@ -219,13 +219,13 @@ func TestClientServer(t *testing.T) {
defer cancel()
// set up socket app
kvstore := NewInMemoryApplication()
client, _, err := makeSocketClientServer(t, kvstore, "kvstore-socket")
client, _, err := makeClientServer(t, kvstore, "kvstore-socket", "socket")
require.NoError(t, err)
runClientTests(ctx, t, client)
// set up grpc app
kvstore = NewInMemoryApplication()
gclient, _, err := makeGRPCClientServer(t, kvstore, t.TempDir())
gclient, _, err := makeClientServer(t, kvstore, t.TempDir(), "grpc")
require.NoError(t, err)
runClientTests(ctx, t, gclient)
}
@@ -271,12 +271,13 @@ func valsEqual(t *testing.T, vals1, vals2 []types.ValidatorUpdate) {
}
}
func makeSocketClientServer(t *testing.T, app types.Application, name string) (abcicli.Client, service.Service, error) {
func makeClientServer(t *testing.T, app types.Application, name, transport string) (abcicli.Client, service.Service, error) {
// Start the listener
socket := fmt.Sprintf("unix://%s.sock", name)
addr := fmt.Sprintf("unix://%s.sock", name)
logger := log.TestingLogger()
server := abciserver.NewSocketServer(socket, app)
server, err := abciserver.NewServer(addr, transport, app)
require.NoError(t, err)
server.SetLogger(logger.With("module", "abci-server"))
if err := server.Start(); err != nil {
return nil, nil, err
@@ -288,40 +289,9 @@ func makeSocketClientServer(t *testing.T, app types.Application, name string) (a
}
})
// Connect to the socket
client := abcicli.NewSocketClient(socket, false)
client.SetLogger(logger.With("module", "abci-client"))
if err := client.Start(); err != nil {
return nil, nil, err
}
t.Cleanup(func() {
if err := client.Stop(); err != nil {
t.Error(err)
}
})
return client, server, nil
}
func makeGRPCClientServer(t *testing.T, app types.Application, name string) (abcicli.Client, service.Service, error) {
// Start the listener
socket := fmt.Sprintf("unix://%s.sock", name)
logger := log.TestingLogger()
server := abciserver.NewGRPCServer(socket, app)
server.SetLogger(logger.With("module", "abci-server"))
if err := server.Start(); err != nil {
return nil, nil, err
}
t.Cleanup(func() {
if err := server.Stop(); err != nil {
t.Error(err)
}
})
client := abcicli.NewGRPCClient(socket, true)
// Connect to the client
client, err := abcicli.NewClient(addr, transport, false)
require.NoError(t, err)
client.SetLogger(logger.With("module", "abci-client"))
if err := client.Start(); err != nil {
return nil, nil, err
consensus/reactor_test.go
+1 -3
View File
@@ -653,14 +653,12 @@ func validateBlock(block *types.Block, activeVals map[string]struct{}) error {
}
func timeoutWaitGroup(t *testing.T, n int, f func(int), css []*State) {
counter := 0
wg := new(sync.WaitGroup)
wg.Add(n)
for i := 0; i < n; i++ {
go func(j int) {
f(j)
wg.Done()
counter++
}(i)
}
@@ -677,7 +675,7 @@ func timeoutWaitGroup(t *testing.T, n int, f func(int), css []*State) {
select {
case <-done:
case <-time.After(timeout):
panic(fmt.Sprintf("Timed out waiting for all validators (got %d / %d) to commit a block", counter, n))
panic("Timed out waiting for all validators to commit a block")
}
}