From 67f0b82ae4b25998787f3b9b1cd0d66c0e9ffab3 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 26 Sep 2022 22:26:42 +0200 Subject: [PATCH] Fix keys --- cmd/node/node.go | 2 -- common/net/secure/service.go | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/node/node.go b/cmd/node/node.go index 6f4cdf88..dd456aa2 100644 --- a/cmd/node/node.go +++ b/cmd/node/node.go @@ -15,7 +15,6 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/common/nodeconf" "github.com/anytypeio/go-anytype-infrastructure-experiments/config" "github.com/anytypeio/go-anytype-infrastructure-experiments/node/nodespace" - "github.com/anytypeio/go-anytype-infrastructure-experiments/service/node" "go.uber.org/zap" "net/http" _ "net/http/pprof" @@ -90,7 +89,6 @@ func main() { func Bootstrap(a *app.App) { a.Register(account.New()). - Register(node.New()). Register(nodeconf.New()). Register(secure.New()). Register(dialer.New()). diff --git a/common/net/secure/service.go b/common/net/secure/service.go index 40a30f8c..306e2d27 100644 --- a/common/net/secure/service.go +++ b/common/net/secure/service.go @@ -6,7 +6,7 @@ import ( "github.com/anytypeio/go-anytype-infrastructure-experiments/app" "github.com/anytypeio/go-anytype-infrastructure-experiments/app/logger" "github.com/anytypeio/go-anytype-infrastructure-experiments/config" - "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys/asymmetric/signingkey" + "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/libp2p/go-libp2p-core/crypto" "github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/sec" @@ -37,8 +37,7 @@ type service struct { func (s *service) Init(a *app.App) (err error) { account := a.MustComponent(config.CName).(*config.Config).Account - decoder := signingkey.NewEDPrivKeyDecoder() - pkb, err := decoder.DecodeFromStringIntoBytes(account.SigningKey) + pkb, err := keys.DecodeBytesFromString(account.SigningKey) if err != nil { return }