fix PrivKey Marshal

app/node/init.go

@@ -77,19 +77,21 @@ func Init(ctx context.Context, r repo.Repo, gen genesis.InitFunc, opts ...InitOp
 	return nil
 }
 
-func initPeerKey(store fskeystore.Keystore, key acrypto.PrivKey) error {
+func initPeerKey(store fskeystore.Keystore, pk acrypto.PrivKey) error {
 	var err error
-	if key == nil {
-		key, _, err = acrypto.GenerateKeyPair(acrypto.RSA, defaultPeerKeyBits)
+	if pk == nil {
+		pk, _, err = acrypto.GenerateKeyPair(acrypto.RSA, defaultPeerKeyBits)
 		if err != nil {
 			return errors.Wrap(err, "failed to create peer key")
 		}
 	}
-	data, err := key.Raw() // TODO ?
+
+	kbytes, err := acrypto.MarshalPrivateKey(pk)
 	if err != nil {
 		return err
 	}
-	if err := store.Put("self", data); err != nil {
+
+	if err := store.Put("self", kbytes); err != nil {
 		return errors.Wrap(err, "failed to store private key")
 	}
 	return nil

pkg/repo/fskeystore/fskeystore_test.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	ci "github.com/libp2p/go-libp2p-core/crypto"
+	"github.com/libp2p/go-libp2p-core/crypto"
 
 	tf "github.com/filecoin-project/venus/pkg/testhelpers/testflags"
 )
@@ -258,15 +258,17 @@ func (rr rr) Read(b []byte) (int, error) {
 }
 
 func privKeyOrFatal(t *testing.T) []byte {
-	priv, _, err := ci.GenerateEd25519Key(rr{})
+	priv, _, err := crypto.GenerateEd25519Key(rr{})
 	if err != nil {
 		t.Fatal(err)
 	}
-	data, err := priv.Bytes()
+
+	kbytes, err := crypto.MarshalPrivateKey(priv)
 	if err != nil {
 		t.Fatal(err)
 	}
-	return data
+
+	return kbytes
 }
 
 func assertGetKey(ks Keystore, name string, exp []byte) error {