update decrypter interface

Author: vreff

pkg/loop/internal/relayer/test/relayer.go

@@ -631,6 +631,8 @@ type fuzzerKeystore struct {
 	acctErr       bool
 	signed        []byte
 	signErr       bool
+	decrypted     []byte
+	decryptErr    bool
 	valuesWithErr bool
 	errStr        string
 }
@@ -664,3 +666,21 @@ func (k fuzzerKeystore) Sign(ctx context.Context, account string, data []byte) (
 
 	return k.signed, nil
 }
+
+func (k fuzzerKeystore) Decrypt(ctx context.Context, account string, encrypted []byte) ([]byte, error) {
+	if k.decryptErr {
+		err := errors.New(k.errStr)
+
+		if k.valuesWithErr {
+			return k.decrypted, err
+		}
+
+		return nil, err
+	}
+
+	if len(k.decrypted) == 0 {
+		return nil, fmt.Errorf("no decrypted data for account %s", account)
+	}
+
+	return k.decrypted, nil
+}

pkg/types/core/keystore.go

@@ -76,17 +76,21 @@ func (s *Ed25519Signer) Sign(r io.Reader, digest []byte, opts crypto.SignerOpts)
 var P2PAccountKey = "P2P_SIGNER"
 var WorkflowAccountKey = "WORKFLOW_DECRYPTER"
 
+type Decrypter interface {
+	Decrypt(encrypted []byte) (decrypted []byte, err error)
+}
+
 // signerDecrypter implements Keystore for a single sign account and decrypt account.
 type signerDecrypter struct {
 	signAccount    *string
 	signer         crypto.Signer
 	decryptAccount *string
-	decrypter      crypto.Decrypter
+	decrypter      Decrypter
 }
 
 var _ Keystore = &signerDecrypter{}
 
-func NewSignerDecrypter(signAccount *string, signer crypto.Signer, decryptAccount *string, decrypter crypto.Decrypter) (*signerDecrypter, error) {
+func NewSignerDecrypter(signAccount *string, signer crypto.Signer, decryptAccount *string, decrypter Decrypter) (*signerDecrypter, error) {
 	return &signerDecrypter{signAccount: signAccount, signer: signer, decryptAccount: decryptAccount, decrypter: decrypter}, nil
 }
 
@@ -113,7 +117,7 @@ func (c *signerDecrypter) Sign(ctx context.Context, account string, data []byte)
 
 func (c *signerDecrypter) Decrypt(ctx context.Context, account string, encrypted []byte) (decrypted []byte, err error) {
 	if c.decryptAccount != nil && *c.decryptAccount == account {
-		return c.decrypter.Decrypt(rand.Reader, encrypted, nil)
+		return c.decrypter.Decrypt(encrypted)
 	}
 	return nil, fmt.Errorf("account not found: %s", account)
 }

pkg/types/core/keystore_test.go

@@ -45,7 +45,7 @@ func (m *mockDecrypter) Public() crypto.PublicKey {
 	return m.publicKey
 }
 
-func (m *mockDecrypter) Decrypt(rand io.Reader, msg []byte, opts crypto.DecrypterOpts) (plaintext []byte, err error) {
+func (m *mockDecrypter) Decrypt(msg []byte) (plaintext []byte, err error) {
 	if m.decryptError != nil {
 		return nil, m.decryptError
 	}
@@ -298,14 +298,14 @@ type boxDecrypter struct {
 	publicKey  *[32]byte
 }
 
-var _ crypto.Decrypter = (*boxDecrypter)(nil)
+var _ core.Decrypter = (*boxDecrypter)(nil)
 
 func (b *boxDecrypter) Public() crypto.PublicKey {
 	pubKeyBytes := b.publicKey[:]
 	return crypto.PublicKey(pubKeyBytes)
 }
 
-func (b *boxDecrypter) Decrypt(_ io.Reader, ciphertext []byte, _ crypto.DecrypterOpts) ([]byte, error) {
+func (b *boxDecrypter) Decrypt(ciphertext []byte) ([]byte, error) {
 	msg, ok := box.OpenAnonymous(nil, ciphertext, b.publicKey, b.privateKey)
 	if !ok {
 		return nil, fmt.Errorf("decryption failed")