From eb7456d38fb6455d31a239c2558bfc73af094e57 Mon Sep 17 00:00:00 2001
From: vyzo <vyzo@hackzen.org>
Date: Fri, 16 Apr 2021 01:05:35 +0300
Subject: [PATCH] update for the new namesys api

---
 core/coreapi/coreapi.go | 10 +++++++++-
 core/coreapi/name.go    |  8 ++++++--
 core/node/ipns.go       | 11 ++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/core/coreapi/coreapi.go b/core/coreapi/coreapi.go
index 309f4863c..f8c165a0c 100644
--- a/core/coreapi/coreapi.go
+++ b/core/coreapi/coreapi.go
@@ -215,7 +215,15 @@ func (api *CoreAPI) WithOptions(opts ...options.ApiOption) (coreiface.CoreAPI, e
 		}
 
 		subApi.routing = offlineroute.NewOfflineRouter(subApi.repo.Datastore(), subApi.recordValidator)
-		subApi.namesys = namesys.NewNameSystem(subApi.routing, subApi.repo.Datastore(), subApi.dnsResolver, cs)
+
+		subApi.namesys, err = namesys.NewNameSystem(subApi.routing,
+			namesys.WithDatastore(subApi.repo.Datastore()),
+			namesys.WithDNSResolver(subApi.dnsResolver),
+			namesys.WithCache(cs))
+		if err != nil {
+			return nil, fmt.Errorf("error constructing namesys: %w", err)
+		}
+
 		subApi.provider = provider.NewOfflineProvider()
 
 		subApi.peerstore = nil
diff --git a/core/coreapi/name.go b/core/coreapi/name.go
index 213e7f6af..b007ccd7d 100644
--- a/core/coreapi/name.go
+++ b/core/coreapi/name.go
@@ -93,9 +93,13 @@ func (api *NameAPI) Search(ctx context.Context, name string, opts ...caopts.Name
 	}
 
 	var resolver namesys.Resolver = api.namesys
-
 	if !options.Cache {
-		resolver = namesys.NewNameSystem(api.routing, api.repo.Datastore(), api.dnsResolver, 0)
+		resolver, err = namesys.NewNameSystem(api.routing,
+			namesys.WithDatastore(api.repo.Datastore()),
+			namesys.WithDNSResolver(api.dnsResolver))
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	if !strings.HasPrefix(name, "/ipns/") {
diff --git a/core/node/ipns.go b/core/node/ipns.go
index 98f2de79c..a178ee332 100644
--- a/core/node/ipns.go
+++ b/core/node/ipns.go
@@ -30,7 +30,16 @@ func RecordValidator(ps peerstore.Peerstore) record.Validator {
 // Namesys creates new name system
 func Namesys(cacheSize int) func(rt routing.Routing, rslv *madns.Resolver, repo repo.Repo) (namesys.NameSystem, error) {
 	return func(rt routing.Routing, rslv *madns.Resolver, repo repo.Repo) (namesys.NameSystem, error) {
-		return namesys.NewNameSystem(rt, repo.Datastore(), rslv, cacheSize), nil
+		opts := []namesys.Option{
+			namesys.WithDatastore(repo.Datastore()),
+			namesys.WithDNSResolver(rslv),
+		}
+
+		if cacheSize > 0 {
+			opts = append(opts, namesys.WithCache(cacheSize))
+		}
+
+		return namesys.NewNameSystem(rt, opts...)
 	}
 }