Revert "Configure core to use DHStore"

This reverts commit 1e082b4.
ipni · Jan 13, 2023 · 1060735 · 1060735
1 parent 1e082b4
commit 1060735
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/command/daemon.go b/command/daemon.go
@@ -143,7 +143,7 @@ func daemonCommand(cctx *cli.Context) error {
 	}
 
 	// Create indexer core
-	indexerCore := engine.New(resultCache, valueStore, engine.WithDHStore(cfg.Indexer.DHStoreURL))
+	indexerCore := engine.New(resultCache, valueStore)
 
 	indexCounts := counter.NewIndexCounts(dstore)
 	indexCounts.SetTotalAddend(cfg.Indexer.IndexCountTotalAddend)

diff --git a/config/indexer.go b/config/indexer.go
@@ -16,9 +16,6 @@ type Indexer struct {
 	// individual multihashes within a Put. A value of 1 means no concurrency,
 	// and zero uses the default.
 	CorePutConcurrency int
-	// DHStoreURL is the base URL for the DHStore service. This option value
-	// tells the indexer core to use a DHStore service, if configured.
-	DHStoreURL string
 	// FreezeAtPercent is the percent used, of the file system that
 	// ValueStoreDir is on, at which to trigger the indexer to enter frozen
 	// mode. A zero value uses the default. A negative value disables freezing.

diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/ipld/go-ipld-adl-hamt v0.0.0-20220616142416-9004dbd839e0
 	github.com/ipld/go-ipld-prime v0.19.0
 	github.com/ipld/go-storethehash v0.3.13
-	github.com/ipni/go-indexer-core v0.6.20-0.20230113114806-c78fdee08ae7
+	github.com/ipni/go-indexer-core v0.6.20-0.20221203120225-301a542115f8
 	github.com/libp2p/go-libp2p v0.23.4
 	github.com/libp2p/go-libp2p-gostream v0.5.0
 	github.com/libp2p/go-libp2p-pubsub v0.8.1
@@ -122,7 +122,6 @@ require (
 	github.com/ipfs/go-verifcid v0.0.2 // indirect
 	github.com/ipld/edelweiss v0.2.0 // indirect
 	github.com/ipld/go-codec-dagpb v1.5.0 // indirect
-	github.com/ipni/dhstore v0.0.0-20230112144046-8ff997ffb734 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
 	github.com/jbenet/goprocess v0.1.4 // indirect

diff --git a/go.sum b/go.sum
@@ -665,10 +665,8 @@ github.com/ipld/go-ipld-prime v0.19.0/go.mod h1:Q9j3BaVXwaA3o5JUDNvptDDr/x8+F7FG
 github.com/ipld/go-ipld-prime/storage/bsadapter v0.0.0-20211210234204-ce2a1c70cd73/go.mod h1:2PJ0JgxyB08t0b2WKrcuqI3di0V+5n6RS/LTUJhkoxY=
 github.com/ipld/go-storethehash v0.3.13 h1:1T6kX5K57lAgxbsGitZEaZMAR3RdWch2kO8okK/BgN8=
 github.com/ipld/go-storethehash v0.3.13/go.mod h1:KCYpzmamubnSwm7fvWcCkm0aIwQh4WRNtzrKK4pVhAQ=
-github.com/ipni/dhstore v0.0.0-20230112144046-8ff997ffb734 h1:/7zMZLsQ/jiS69JXESqk0BwxBBrxJHMDTmqgP11/wsQ=
-github.com/ipni/dhstore v0.0.0-20230112144046-8ff997ffb734/go.mod h1:5tFpcinFsdZEsBr+iVvPhVkmpRAfrzBlcZXqy646k30=
-github.com/ipni/go-indexer-core v0.6.20-0.20230113114806-c78fdee08ae7 h1:FfW0xTLlxlSIuqMSfMcgxGJaxAt/5G53c8uWY/pzaW8=
-github.com/ipni/go-indexer-core v0.6.20-0.20230113114806-c78fdee08ae7/go.mod h1:n1redpWwh2Id2vboe5dVhNnn+Brw+JDqNNqsYOljvUU=
+github.com/ipni/go-indexer-core v0.6.20-0.20221203120225-301a542115f8 h1:yVqgbaS/EwnJggQYpxf6mYJ//72NbPyM9MAGjDeD+8g=
+github.com/ipni/go-indexer-core v0.6.20-0.20221203120225-301a542115f8/go.mod h1:EBHAKGJXuQUbdDYWCCmVCNrTO7vkapCeaDUG6my66J0=
 github.com/ipsn/go-secp256k1 v0.0.0-20180726113642-9d62b9f0bc52 h1:QG4CGBqCeuBo6aZlGAamSkxWdgWfZGeE49eUOWJPA4c=
 github.com/ipsn/go-secp256k1 v0.0.0-20180726113642-9d62b9f0bc52/go.mod h1:fdg+/X9Gg4AsAIzWpEHwnqd+QY3b7lajxyjE1m4hkq4=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=