Skip to content

Use context in integration test #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tzdybal merged 2 commits into from
Sep 26, 2022
Merged

Use context in integration test #539

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cdcb03
ci: try to increase timeout in test
tzdybal Sep 20, 2022
3e7b984
testing: improve node shutdown in tests
tzdybal Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions node/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ func TestTxGossipingAndAggregation(t *testing.T) {

var wg sync.WaitGroup
clientNodes := 4
nodes, apps := createNodes(clientNodes+1, &wg, t)
aggCtx, aggCancel := context.WithCancel(context.Background())
ctx, cancel := context.WithCancel(context.Background())
nodes, apps := createNodes(aggCtx, ctx, clientNodes+1, &wg, t)

wg.Add((clientNodes + 1) * clientNodes)
for _, n := range nodes {
Expand All @@ -115,9 +117,13 @@ func TestTxGossipingAndAggregation(t *testing.T) {
t.Fatal("failing after timeout")
}

for _, n := range nodes {
require.NoError(nodes[0].Stop())
aggCancel()
time.Sleep(100 * time.Millisecond)
for _, n := range nodes[1:] {
require.NoError(n.Stop())
}
cancel()
time.Sleep(100 * time.Millisecond)
aggApp := apps[0]
apps = apps[1:]
Expand Down Expand Up @@ -160,9 +166,16 @@ func TestTxGossipingAndAggregation(t *testing.T) {
}
}

func createNodes(num int, wg *sync.WaitGroup, t *testing.T) ([]*Node, []*mocks.Application) {
func createNodes(aggCtx, ctx context.Context, num int, wg *sync.WaitGroup, t *testing.T) ([]*Node, []*mocks.Application) {
t.Helper()

if aggCtx == nil {
aggCtx = context.Background()
}
if ctx == nil {
ctx = context.Background()
}

// create keys first, as they are required for P2P connections
keys := make([]crypto.PrivKey, num)
for i := 0; i < num; i++ {
Expand All @@ -175,15 +188,15 @@ func createNodes(num int, wg *sync.WaitGroup, t *testing.T) ([]*Node, []*mocks.A
_ = dalc.Init([8]byte{}, nil, store.NewDefaultInMemoryKVStore(), log.TestingLogger())
_ = dalc.Start()

nodes[0], apps[0] = createNode(0, true, dalc, keys, wg, t)
nodes[0], apps[0] = createNode(aggCtx, 0, true, dalc, keys, wg, t)
for i := 1; i < num; i++ {
nodes[i], apps[i] = createNode(i, false, dalc, keys, wg, t)
nodes[i], apps[i] = createNode(ctx, i, false, dalc, keys, wg, t)
}

return nodes, apps
}

func createNode(n int, aggregator bool, dalc da.DataAvailabilityLayerClient, keys []crypto.PrivKey, wg *sync.WaitGroup, t *testing.T) (*Node, *mocks.Application) {
func createNode(ctx context.Context, n int, aggregator bool, dalc da.DataAvailabilityLayerClient, keys []crypto.PrivKey, wg *sync.WaitGroup, t *testing.T) (*Node, *mocks.Application) {
t.Helper()
require := require.New(t)
// nodes will listen on consecutive ports on local interface
Expand Down Expand Up @@ -216,10 +229,13 @@ func createNode(n int, aggregator bool, dalc da.DataAvailabilityLayerClient, key
app.On("DeliverTx", mock.Anything).Return(abci.ResponseDeliverTx{}).Run(func(args mock.Arguments) {
wg.Done()
})
if ctx == nil {
ctx = context.Background()
}

signingKey, _, _ := crypto.GenerateEd25519Key(rand.Reader)
node, err := NewNode(
context.Background(),
ctx,
config.NodeConfig{
P2P: p2pConfig,
DALayer: "mock",
Expand Down