Skip to content

Commit

Permalink
fix gen priv key + test
Browse files Browse the repository at this point in the history
  • Loading branch information
amirylm committed Nov 27, 2023
1 parent 4ccaefa commit f6c7152
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
9 changes: 5 additions & 4 deletions commons/net.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,17 @@ func GetOrGeneratePrivateKey(privKeyB64 string) (sk crypto.PrivKey, encodedB64 s
return nil, encodedB64, err
}
// TODO: pool base64 encoders
encodedB64 = base64.StdEncoding.EncodeToString(encoded)
encodedB64 = base64.RawStdEncoding.EncodeToString(encoded)
return sk, encodedB64, nil
}
encoded, err := base64.StdEncoding.DecodeString(encodedB64)
encodedB64 = privKeyB64
encoded, err := base64.RawStdEncoding.DecodeString(encodedB64)
if err != nil {
return nil, privKeyB64, fmt.Errorf("failed to decode private key with base64: %w", err)
return nil, encodedB64, fmt.Errorf("failed to decode private key with base64: %w", err)
}
sk, err = crypto.UnmarshalPrivateKey(encoded)
if err != nil {
return nil, privKeyB64, fmt.Errorf("failed to unmarshal private key: %w", err)
return nil, encodedB64, fmt.Errorf("failed to unmarshal private key: %w", err)
}
return sk, encodedB64, nil
}
20 changes: 20 additions & 0 deletions commons/net_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package commons

import (
"testing"

"github.com/stretchr/testify/require"
)

func TestGetOrGeneratePrivateKey(t *testing.T) {
sk, skb64, err := GetOrGeneratePrivateKey("")
require.NoError(t, err)
require.NotNil(t, sk)
require.NotEmpty(t, skb64)

sk2, sk2b64, err := GetOrGeneratePrivateKey(skb64)
require.NoError(t, err)
require.NotNil(t, sk2)
require.Equal(t, skb64, sk2b64)
require.True(t, sk.Equals(sk2))
}

0 comments on commit f6c7152

Please sign in to comment.