benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify code in decoders

Browse Source
This commit is contained in:
mcrakhman 2022-07-14 21:29:10 +02:00
parent 293ada96c8
commit 5f8dc32ed6
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/acl/acltree/acltree_test.go
View File

@ -67,14 +67,12 @@ func TestACLTree_UserJoinUpdate_Append(t *testing.T) {
// Use this for key generation // Use this for key generation
//encryptionDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) { //encryptionDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
// key, err := encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes) // return encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes)
// return key, err
//}) //})
//encodedEncryptionKey, _ := encryptionDecoder.EncodeToString(keychain.EncryptionKeys["A"]) //encodedEncryptionKey, _ := encryptionDecoder.EncodeToString(keychain.EncryptionKeys["A"])
// //
//signingDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) { //signingDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
// key, err := signingkey.NewSigningEd25519PrivKeyFromBytes(bytes) // return signingkey.NewSigningEd25519PrivKeyFromBytes(bytes)
// return key, err
//}) //})
//encodedSigningKey, _ := signingDecoder.EncodeToString(keychain.SigningKeys["A"]) //encodedSigningKey, _ := signingDecoder.EncodeToString(keychain.SigningKeys["A"])
// //

6
service/account/service.go
View File

@ -40,12 +40,10 @@ func NewFromFile(path string) (app.Component, error) {
return nil, err return nil, err
} }
privateEncryptionDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) { privateEncryptionDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
key, err := encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes) return encryptionkey.NewEncryptionRsaPrivKeyFromBytes(bytes)
return key, err
}) })
privateSigningDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) { privateSigningDecoder := keys.NewKeyDecoder(func(bytes []byte) (keys.Key, error) {
key, err := signingkey.NewSigningEd25519PrivKeyFromBytes(bytes) return signingkey.NewSigningEd25519PrivKeyFromBytes(bytes)
return key, err
}) })
// TODO: Convert this to new decoder // TODO: Convert this to new decoder
publicSigningDecoder := signingkey.NewEd25519PubKeyDecoder() publicSigningDecoder := signingkey.NewEd25519PubKeyDecoder()