From c27e8a97731e48d0203a96d4e34997b3832ff2d9 Mon Sep 17 00:00:00 2001
From: Sergey Cherepanov <grigory.efimov@gmail.com>
Date: Fri, 13 Jan 2023 12:11:20 +0300
Subject: [PATCH] test account improve

---
 testutil/accounttest/accountservice.go | 30 ++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/testutil/accounttest/accountservice.go b/testutil/accounttest/accountservice.go
index d8c3268b..e745f1e7 100644
--- a/testutil/accounttest/accountservice.go
+++ b/testutil/accounttest/accountservice.go
@@ -4,8 +4,11 @@ import (
 	accountService "github.com/anytypeio/any-sync/accountservice"
 	"github.com/anytypeio/any-sync/app"
 	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/nodeconf"
+	"github.com/anytypeio/any-sync/util/keys"
 	"github.com/anytypeio/any-sync/util/keys/asymmetric/encryptionkey"
 	"github.com/anytypeio/any-sync/util/keys/asymmetric/signingkey"
+	"github.com/anytypeio/any-sync/util/peer"
 )
 
 // AccountTestService provides service for test purposes, generates new random account every Init
@@ -14,6 +17,9 @@ type AccountTestService struct {
 }
 
 func (s *AccountTestService) Init(a *app.App) (err error) {
+	if s.acc != nil {
+		return
+	}
 	encKey, _, err := encryptionkey.GenerateRandomRSAKeyPair(2048)
 	if err != nil {
 		return
@@ -27,7 +33,13 @@ func (s *AccountTestService) Init(a *app.App) (err error) {
 	if err != nil {
 		return
 	}
+
+	peerId, err := peer.IdFromSigningPubKey(signKey.GetPublic())
+	if err != nil {
+		return err
+	}
 	s.acc = &accountdata.AccountData{
+		PeerId:   peerId.String(),
 		Identity: ident,
 		SignKey:  signKey,
 		EncKey:   encKey,
@@ -42,3 +54,21 @@ func (s *AccountTestService) Name() (name string) {
 func (s *AccountTestService) Account() *accountdata.AccountData {
 	return s.acc
 }
+
+func (s *AccountTestService) NodeConf(addrs []string) nodeconf.NodeConfig {
+	encSk, err := keys.EncodeKeyToString(s.acc.SignKey)
+	if err != nil {
+		panic(err)
+	}
+	encEk, err := keys.EncodeKeyToString(s.acc.EncKey)
+	if err != nil {
+		panic(err)
+	}
+	return nodeconf.NodeConfig{
+		PeerId:        s.acc.PeerId,
+		Addresses:     addrs,
+		SigningKey:    encSk,
+		EncryptionKey: encEk,
+		Types:         []nodeconf.NodeType{nodeconf.NodeTypeTree},
+	}
+}