From dc0de3732df5256ec4dcc8fe10b091d3a25ed60d Mon Sep 17 00:00:00 2001 From: Lorenz Herzberger Date: Wed, 14 Jun 2023 15:05:42 +0200 Subject: [PATCH] fixed keypair sample and test case Signed-off-by: Lorenz Herzberger --- testutil/sample/sample.go | 9 +++++---- x/asset/keeper/msg_server_test.go | 25 +++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/testutil/sample/sample.go b/testutil/sample/sample.go index 016a29e..7d55522 100644 --- a/testutil/sample/sample.go +++ b/testutil/sample/sample.go @@ -1,19 +1,20 @@ package sample import ( + "encoding/hex" machinetypes "planetmint-go/x/machine/types" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" ) // KeyPair returns a sample private / public keypair func KeyPair() (string, string) { - secret := "Hello World!" - sk := ed25519.GenPrivKeyFromSecret([]byte(secret)) + secret := "Don't tell anybody" + sk := secp256k1.GenPrivKeyFromSecret([]byte(secret)) pk := sk.PubKey() - - return sk.String(), pk.String() + return hex.EncodeToString(sk.Bytes()), hex.EncodeToString(pk.Bytes()) } // AccAddress returns a sample account address diff --git a/x/asset/keeper/msg_server_test.go b/x/asset/keeper/msg_server_test.go index 081214a..a1eeede 100644 --- a/x/asset/keeper/msg_server_test.go +++ b/x/asset/keeper/msg_server_test.go @@ -2,6 +2,8 @@ package keeper_test import ( "context" + "crypto/sha256" + "encoding/hex" "testing" keepertest "planetmint-go/testutil/keeper" @@ -9,6 +11,7 @@ import ( "planetmint-go/x/asset/keeper" "planetmint-go/x/asset/types" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/assert" ) @@ -19,8 +22,26 @@ func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { } func TestMsgServerNotarizeAsset(t *testing.T) { - _, pk := sample.KeyPair() - msg := types.NewMsgNotarizeAsset(pk, "cid", "sign", "pubkey") + sk, pk := sample.KeyPair() + cid := "cid" + + skBytes, err := hex.DecodeString(sk) + if err != nil { + assert.Equal(t, true, false) + } + privKey := &secp256k1.PrivKey{Key: skBytes} + + cidBytes, _ := hex.DecodeString(cid) + hash := sha256.Sum256(cidBytes) + + sign, err := privKey.Sign(hash[:]) + if err != nil { + assert.Equal(t, true, false) + } + + signatureHex := hex.EncodeToString(sign) + + msg := types.NewMsgNotarizeAsset(pk, cid, signatureHex, pk) msgServer, ctx := setupMsgServer(t) res, err := msgServer.NotarizeAsset(ctx, msg) if assert.NoError(t, err) {