From 760a3de40932f80c3f59706ffb6064c05c0ffb85 Mon Sep 17 00:00:00 2001 From: anton Date: Tue, 31 Aug 2021 18:28:40 +0300 Subject: [PATCH] fixed merge error --- activation/activation_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activation/activation_test.go b/activation/activation_test.go index 9d285327a0..6c74b25427 100644 --- a/activation/activation_test.go +++ b/activation/activation_test.go @@ -328,7 +328,7 @@ func TestBuilder_StartSmeshingCoinbase(t *testing.T) { builder := newBuilder(t, activationDb) coinbase := types.Address{1, 1, 1} - require.NoError(t, builder.StartSmeshing(context.Background(), coinbase, PostSetupOpts{})) + require.NoError(t, builder.StartSmeshing(coinbase, PostSetupOpts{})) t.Cleanup(func() { builder.StopSmeshing(true) }) require.Equal(t, coinbase, builder.Coinbase()) }