Add sdk/ton/executor_test.go

Author: krebernisak

sdk/ton/configurer_test.go

@@ -11,14 +11,16 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/smartcontractkit/mcms/internal/testutils/chaintest"
+	"github.com/smartcontractkit/mcms/types"
+
 	"github.com/xssnick/tonutils-go/tlb"
 	"github.com/xssnick/tonutils-go/ton"
 	"github.com/xssnick/tonutils-go/ton/wallet"
 
-	"github.com/smartcontractkit/mcms/internal/testutils/chaintest"
 	tonmcms "github.com/smartcontractkit/mcms/sdk/ton"
 	ton_mocks "github.com/smartcontractkit/mcms/sdk/ton/mocks"
-	"github.com/smartcontractkit/mcms/types"
 )
 
 // TestConfigurer_SetConfig tests the SetConfig method of the Configurer.
@@ -127,7 +129,7 @@ func TestConfigurer_SetConfig(t *testing.T) {
 
 				// Mock SendTransaction to return an error
 				m.EXPECT().SendExternalMessageWaitTransaction(mock.Anything, mock.Anything).
-					Return(&tlb.Transaction{Hash: []byte{1, 2, 3, 4, 15}}, &ton.BlockIDExt{}, []byte{}, errors.New("transaction failed"))
+					Return(&tlb.Transaction{Hash: []byte{1, 2, 3, 4, 14}}, &ton.BlockIDExt{}, []byte{}, errors.New("transaction failed"))
 			},
 			want:    "",
 			wantErr: errors.New("transaction failed"),

sdk/ton/executor.go

@@ -38,13 +38,25 @@ type executor struct {
 }
 
 // NewExecutor creates a new Executor for TON chains
-func NewExecutor(encoder sdk.Encoder, client *ton.APIClient, wallet *wallet.Wallet, amount tlb.Coins) sdk.Executor {
+func NewExecutor(encoder sdk.Encoder, client ton.APIClientWrapped, wallet *wallet.Wallet, amount tlb.Coins) (sdk.Executor, error) {
+	if encoder == nil {
+		return nil, errors.New("failed to create sdk.Executor - encoder (sdk.Encoder) is nil")
+	}
+
+	if client == nil {
+		return nil, errors.New("failed to create sdk.Executor - client (ton.APIClientWrapped) is nil")
+	}
+
+	if wallet == nil {
+		return nil, errors.New("failed to create sdk.Executor - wallet (*wallet.Wallet) is nil")
+	}
+
 	return &executor{
 		Encoder:   encoder,
 		Inspector: NewInspector(client, NewConfigTransformer()),
 		wallet:    wallet,
 		amount:    amount,
-	}
+	}, nil
 }
 
 func (e *executor) ExecuteOperation(
@@ -54,10 +66,6 @@ func (e *executor) ExecuteOperation(
 	proof []common.Hash,
 	op types.Operation,
 ) (types.TransactionResult, error) {
-	if e.Encoder == nil {
-		return types.TransactionResult{}, errors.New("executor was created without an encoder")
-	}
-
 	oe, ok := e.Encoder.(OperationEncoder[mcms.Op])
 	if !ok {
 		return types.TransactionResult{}, fmt.Errorf("failed to assert OperationEncoder")
@@ -127,16 +135,6 @@ func (e *executor) SetRoot(
 	validUntil uint32,
 	sortedSignatures []types.Signature,
 ) (types.TransactionResult, error) {
-	if e.Encoder == nil {
-		return types.TransactionResult{}, errors.New("Executor was created without an encoder")
-	}
-
-	// Map to Ton Address type
-	dstAddr, err := address.ParseAddr(metadata.MCMAddress)
-	if err != nil {
-		return types.TransactionResult{}, fmt.Errorf("invalid timelock address: %w", err)
-	}
-
 	rme, ok := e.Encoder.(RootMetadataEncoder[mcms.RootMetadata])
 	if !ok {
 		return types.TransactionResult{}, fmt.Errorf("failed to assert RootMetadataEncoder")
@@ -147,6 +145,12 @@ func (e *executor) SetRoot(
 		return types.TransactionResult{}, fmt.Errorf("failed to convert to root metadata: %w", err)
 	}
 
+	// Map to Ton Address type
+	dstAddr, err := address.ParseAddr(metadata.MCMAddress)
+	if err != nil {
+		return types.TransactionResult{}, fmt.Errorf("invalid timelock address: %w", err)
+	}
+
 	// Encode proofs
 	pe, ok := e.Encoder.(ProofEncoder[mcms.Proof])
 	if !ok {