From 74ac0dbf1e09f9ef6e7c0fa71ed32adc874753b7 Mon Sep 17 00:00:00 2001
From: frank <zcl@rss3.io>
Date: Sat, 14 Sep 2024 10:50:54 +0800
Subject: [PATCH] fix: fix merge conflict

---
 internal/engine/source/factory.go                   | 2 --
 internal/engine/worker/decentralized/core/worker.go | 4 ----
 internal/node/indexer/server.go                     | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/internal/engine/source/factory.go b/internal/engine/source/factory.go
index 41d78491..d67df282 100644
--- a/internal/engine/source/factory.go
+++ b/internal/engine/source/factory.go
@@ -28,8 +28,6 @@ func New(config *config.Module, sourceFilter engine.DataSourceFilter, checkpoint
 		return activitypub.NewSource(config, checkpoint, databaseClient)
 	case network.NearSource:
 		return near.NewSource(config, sourceFilter, checkpoint, redisClient)
-	case network.ActivityPubSource:
-		return activitypub.NewSource(config, checkpoint, databaseClient)
 	default:
 		return nil, fmt.Errorf("unsupported network source %s", config.Network)
 	}
diff --git a/internal/engine/worker/decentralized/core/worker.go b/internal/engine/worker/decentralized/core/worker.go
index 1fd7725f..f2114ef5 100644
--- a/internal/engine/worker/decentralized/core/worker.go
+++ b/internal/engine/worker/decentralized/core/worker.go
@@ -21,12 +21,8 @@ func NewWorker(config *config.Module, redisClient rueidis.Client) (engine.Worker
 		return mastodon.NewWorker()
 	case network.EthereumSource:
 		return ethereum.NewWorker(config, redisClient)
-	case network.ActivityPubSource:
-		return mastodon.NewWorker()
 	case network.ArweaveSource:
 		return arweave.NewWorker(config)
-	case network.EthereumSource:
-		return ethereum.NewWorker(config, redisClient)
 	case network.FarcasterSource:
 		return farcaster.NewWorker()
 	case network.NearSource:
diff --git a/internal/node/indexer/server.go b/internal/node/indexer/server.go
index e67a3d80..53216df5 100644
--- a/internal/node/indexer/server.go
+++ b/internal/node/indexer/server.go
@@ -15,7 +15,7 @@ import (
 	"github.com/rss3-network/node/internal/engine"
 	"github.com/rss3-network/node/internal/engine/source"
 	decentralizedWorker "github.com/rss3-network/node/internal/engine/worker/decentralized"
-	worker "github.com/rss3-network/node/internal/engine/worker/decentralized"
+	// worker "github.com/rss3-network/node/internal/engine/worker/decentralized"
 	federatedWorker "github.com/rss3-network/node/internal/engine/worker/federated"
 	"github.com/rss3-network/node/internal/node/monitor"
 	"github.com/rss3-network/node/internal/stream"