From 2d977ed5355a8897dc53131f7665b4b8080d7a0f Mon Sep 17 00:00:00 2001
From: mcrakhman <rakhmanov.m@gmail.com>
Date: Sun, 26 Mar 2023 18:47:35 +0200
Subject: [PATCH] Fix tests

---
 accountservice/accountservice.go                  |  7 +++----
 .../object/acl/list/mock_list/mock_list.go        | 15 +++++++++++++++
 commonspace/object/tree/exporter/treeexporter.go  |  6 +++---
 commonspace/settings/settings_test.go             | 10 ++--------
 net/timeoutconn/conn.go                           |  1 -
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/accountservice/accountservice.go b/accountservice/accountservice.go
index 0c3c0bf0..c15364f3 100644
--- a/accountservice/accountservice.go
+++ b/accountservice/accountservice.go
@@ -14,10 +14,9 @@ type Service interface {
 }
 
 type Config struct {
-	PeerId        string `yaml:"peerId"`
-	PeerKey       string `yaml:"peerKey"`
-	SigningKey    string `yaml:"signingKey"`
-	EncryptionKey string `yaml:"encryptionKey"`
+	PeerId     string `yaml:"peerId"`
+	PeerKey    string `yaml:"peerKey"`
+	SigningKey string `yaml:"signingKey"`
 }
 
 type ConfigGetter interface {
diff --git a/commonspace/object/acl/list/mock_list/mock_list.go b/commonspace/object/acl/list/mock_list/mock_list.go
index 378792fe..3d3163d9 100644
--- a/commonspace/object/acl/list/mock_list/mock_list.go
+++ b/commonspace/object/acl/list/mock_list/mock_list.go
@@ -9,6 +9,7 @@ import (
 
 	aclrecordproto "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
 	list "github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	crypto "github.com/anytypeio/any-sync/util/crypto"
 	gomock "github.com/golang/mock/gomock"
 )
 
@@ -160,6 +161,20 @@ func (mr *MockAclListMockRecorder) IterateFrom(arg0, arg1 interface{}) *gomock.C
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IterateFrom", reflect.TypeOf((*MockAclList)(nil).IterateFrom), arg0, arg1)
 }
 
+// KeyStorage mocks base method.
+func (m *MockAclList) KeyStorage() crypto.KeyStorage {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "KeyStorage")
+	ret0, _ := ret[0].(crypto.KeyStorage)
+	return ret0
+}
+
+// KeyStorage indicates an expected call of KeyStorage.
+func (mr *MockAclListMockRecorder) KeyStorage() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KeyStorage", reflect.TypeOf((*MockAclList)(nil).KeyStorage))
+}
+
 // Lock mocks base method.
 func (m *MockAclList) Lock() {
 	m.ctrl.T.Helper()
diff --git a/commonspace/object/tree/exporter/treeexporter.go b/commonspace/object/tree/exporter/treeexporter.go
index fe77fb26..459d6c75 100644
--- a/commonspace/object/tree/exporter/treeexporter.go
+++ b/commonspace/object/tree/exporter/treeexporter.go
@@ -2,10 +2,10 @@ package exporter
 
 import (
 	"github.com/anytypeio/any-sync/commonspace/object/acl/liststorage"
-	"github.com/anytypeio/any-sync/commonspace/object/keychain"
 	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
 	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
 	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/util/crypto"
 )
 
 type DataConverter interface {
@@ -48,7 +48,7 @@ func (t *treeExporter) ExportUnencrypted(tree objecttree.ReadableObjectTree) (er
 	if err != nil {
 		return
 	}
-	changeBuilder := objecttree.NewChangeBuilder(keychain.NewKeychain(), tree.Header())
+	changeBuilder := objecttree.NewChangeBuilder(crypto.NewKeyStorage(), tree.Header())
 	putStorage := func(change *objecttree.Change) (err error) {
 		var raw *treechangeproto.RawTreeChangeWithId
 		raw, err = changeBuilder.Marshall(change)
@@ -68,7 +68,7 @@ func (t *treeExporter) ExportUnencrypted(tree objecttree.ReadableObjectTree) (er
 			return false
 		}
 		// that means that change is unencrypted
-		change.ReadKeyId = 0
+		change.ReadKeyId = ""
 		change.Data = data
 		err = putStorage(change)
 		return err == nil
diff --git a/commonspace/settings/settings_test.go b/commonspace/settings/settings_test.go
index c3a89c19..1526b1f4 100644
--- a/commonspace/settings/settings_test.go
+++ b/commonspace/settings/settings_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
 	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
 	"github.com/anytypeio/any-sync/commonspace/spacestorage/mock_spacestorage"
-	"github.com/anytypeio/any-sync/util/crypto"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"sync"
@@ -146,17 +145,12 @@ func TestSettingsObject_DeleteObject(t *testing.T) {
 	fx.doc.state = &settingsstate.State{LastIteratedId: "someId"}
 	fx.changeFactory.EXPECT().CreateObjectDeleteChange(delId, fx.doc.state, false).Return(res, nil)
 
-	accountData := &accountdata.AccountKeys{
-		Identity: []byte("id"),
-		PeerKey:  nil,
-		SignKey:  &crypto.Ed25519PrivKey{},
-		EncKey:   nil,
-	}
+	accountData, err := accountdata.NewRandom()
+	require.NoError(t, err)
 	fx.account.EXPECT().Account().Return(accountData)
 	fx.syncTree.EXPECT().AddContent(gomock.Any(), objecttree.SignableChangeContent{
 		Data:        res,
 		Key:         accountData.SignKey,
-		Identity:    accountData.Identity,
 		IsSnapshot:  false,
 		IsEncrypted: false,
 	}).Return(objecttree.AddResult{}, nil)
diff --git a/net/timeoutconn/conn.go b/net/timeoutconn/conn.go
index 62917dbc..28d13495 100644
--- a/net/timeoutconn/conn.go
+++ b/net/timeoutconn/conn.go
@@ -27,7 +27,6 @@ func (c *Conn) Write(p []byte) (n int, err error) {
 			if e := c.Conn.SetWriteDeadline(time.Now().Add(c.timeout)); e != nil {
 				log.Warn("can't set write deadline", zap.String("remoteAddr", c.RemoteAddr().String()))
 			}
-
 		}
 		nn, err := c.Conn.Write(p[n:])
 		n += nn