1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-08 05:57:03 +09:00

Fix handshake tests

This commit is contained in:
mcrakhman 2023-03-26 13:45:24 +02:00 committed by Mikhail Iudin
parent 52f462ff2c
commit 4efe189eec
No known key found for this signature in database
GPG key ID: FAAAA8BAABDFF1C0
11 changed files with 56 additions and 57 deletions

View file

@ -6,8 +6,6 @@ import (
"github.com/anytypeio/any-sync/commonspace/object/accountdata"
"github.com/anytypeio/any-sync/nodeconf"
"github.com/anytypeio/any-sync/util/crypto"
"github.com/anytypeio/any-sync/util/keys"
"github.com/anytypeio/any-sync/util/keys/asymmetric/encryptionkey"
"github.com/anytypeio/any-sync/util/peer"
)
@ -20,19 +18,10 @@ func (s *AccountTestService) Init(a *app.App) (err error) {
if s.acc != nil {
return
}
encKey, _, err := encryptionkey.GenerateRandomRSAKeyPair(2048)
if err != nil {
return
}
signKey, _, err := crypto.GenerateRandomEd25519KeyPair()
if err != nil {
return
}
ident, err := signKey.GetPublic().Raw()
if err != nil {
return
}
peerKey, _, err := crypto.GenerateRandomEd25519KeyPair()
if err != nil {
@ -44,11 +33,9 @@ func (s *AccountTestService) Init(a *app.App) (err error) {
return err
}
s.acc = &accountdata.AccountKeys{
Identity: ident,
PeerKey: peerKey,
SignKey: signKey,
EncKey: encKey,
PeerId: peerId.String(),
PeerKey: peerKey,
SignKey: signKey,
PeerId: peerId.String(),
}
return nil
}
@ -62,14 +49,9 @@ func (s *AccountTestService) Account() *accountdata.AccountKeys {
}
func (s *AccountTestService) NodeConf(addrs []string) nodeconf.NodeConfig {
encEk, err := keys.EncodeKeyToString(s.acc.EncKey.GetPublic())
if err != nil {
panic(err)
}
return nodeconf.NodeConfig{
PeerId: s.acc.PeerId,
Addresses: addrs,
EncryptionKey: encEk,
Types: []nodeconf.NodeType{nodeconf.NodeTypeTree},
PeerId: s.acc.PeerId,
Addresses: addrs,
Types: []nodeconf.NodeType{nodeconf.NodeTypeTree},
}
}