cleanups

spacemeshos · Aug 8, 2024 · 287b528 · 287b528
1 parent 9a834fa
commit 287b528
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/activation/e2e/atx_merge_test.go b/activation/e2e/atx_merge_test.go
@@ -513,5 +513,9 @@ func Test_MarryAndMerge(t *testing.T) {
 		require.Equal(t, units[i], atxFromDb.NumUnits)
 		require.Equal(t, signer.NodeID(), atxFromDb.SmesherID)
 		require.Equal(t, publish, atxFromDb.PublishEpoch)
+		prev, err := atxs.Previous(db, atxFromDb.ID())
+		require.NoError(t, err)
+		require.Len(t, prev, 1)
+		require.Equal(t, mergedATX2.ID(), prev[0])
 	}
 }
diff --git a/activation/handler_v2.go b/activation/handler_v2.go
@@ -786,11 +786,7 @@ func (h *HandlerV2) checkDoubleMerge(ctx context.Context, tx *sql.Tx, watx *acti
 }
 
 // Store an ATX in the DB.
-func (h *HandlerV2) storeAtx(
-	ctx context.Context,
-	atx *types.ActivationTx,
-	watx *activationTx,
-) error {
+func (h *HandlerV2) storeAtx(ctx context.Context, atx *types.ActivationTx, watx *activationTx) error {
 	if err := h.cdb.WithTx(ctx, func(tx *sql.Tx) error {
 		if len(watx.marriages) != 0 {
 			marriageData := identities.MarriageData{

diff --git a/api/grpcserver/v2alpha1/activation.go b/api/grpcserver/v2alpha1/activation.go
@@ -129,7 +129,7 @@ func (s *ActivationStreamService) Stream(
 					}
 					continue
 				}
-				err = stream.Send(toAtx(rst))
+				err := stream.Send(toAtx(rst))
 				switch {
 				case errors.Is(err, io.EOF):
 					return nil

diff --git a/api/grpcserver/v2alpha1/activation_test.go b/api/grpcserver/v2alpha1/activation_test.go
@@ -194,19 +194,19 @@ func TestActivationStreamService_Stream(t *testing.T) {
 				_, err = stream.Header()
 				require.NoError(t, err)
 
-				var expect []*events.ActivationTx
+				var expect []*types.ActivationTx
 				for _, rst := range streamed {
 					events.ReportNewActivation(rst.ActivationTx)
 					matcher := atxsMatcher{tc.request, ctx}
 					if matcher.match(rst) {
-						expect = append(expect, rst)
+						expect = append(expect, rst.ActivationTx)
 					}
 				}
 
 				for _, rst := range expect {
 					received, err := stream.Recv()
 					require.NoError(t, err)
-					require.Equal(t, toAtx(rst.ActivationTx).String(), received.String())
+					require.Equal(t, toAtx(rst).String(), received.String())
 				}
 			})
 		}