Fix after merge with develop

activation/e2e/atx_merge_test.go

@@ -206,18 +206,11 @@ func Test_MarryAndMerge(t *testing.T) {
 	logger := zaptest.NewLogger(t)
 	goldenATX := types.ATXID{2, 3, 4}
 	coinbase := types.Address{1, 2, 3, 4, 5, 6, 7}
-	cfg := activation.DefaultPostConfig()
+	cfg := testPostConfig()
 	db := sql.InMemory()
 	cdb := datastore.NewCachedDB(db, logger)
 	localDB := localsql.InMemory()
 
-	syncer := activation.NewMocksyncer(ctrl)
-	syncer.EXPECT().RegisterForATXSynced().DoAndReturn(func() <-chan struct{} {
-		synced := make(chan struct{})
-		close(synced)
-		return synced
-	}).AnyTimes()
-
 	svc := grpcserver.NewPostService(logger)
 	svc.AllowConnections(true)
 	grpcCfg, cleanup := launchServer(t, svc)
@@ -239,15 +232,7 @@ func Test_MarryAndMerge(t *testing.T) {
 		totalNumUnits += units[i]
 
 		eg.Go(func() error {
-			mgr, err := activation.NewPostSetupManager(cfg, logger, db, atxsdata.New(), goldenATX, syncer, validator)
-			require.NoError(t, err)
-
-			t.Cleanup(launchPostSupervisor(t, zap.NewNop(), mgr, sig, grpcCfg, opts))
-
-			require.Eventually(t, func() bool {
-				_, err := svc.Client(sig.NodeID())
-				return err == nil
-			}, 10*time.Second, 100*time.Millisecond, "timed out waiting for connection")
+			initPost(t, cfg, opts, sig, goldenATX, grpcCfg, svc)
 			return nil
 		})
 	}

activation/e2e/nipost_test.go

@@ -140,11 +140,6 @@ func initPost(
 	mgr, err := activation.NewPostSetupManager(cfg, logger, db, atxsdata.New(), golden, syncer, nil)
 	require.NoError(tb, err)
 
-	// Create data.
-	require.NoError(tb, mgr.PrepareInitializer(context.Background(), opts, sig.NodeID()))
-	require.NoError(tb, mgr.StartSession(context.Background(), sig.NodeID()))
-	require.Equal(tb, activation.PostSetupStateComplete, mgr.Status().State)
-
 	stop := launchPostSupervisor(tb, logger, mgr, sig, grpcCfg, cfg, opts)
 	tb.Cleanup(stop)
 	require.Eventually(tb, func() bool {