Merge branch 'master' into dependabot/go_modules/github.com/aws/aws-sdk-go-v2/service/kms-1.50.1

Author: chasefleming

access/client.go

@@ -89,6 +89,12 @@ type Client interface {
 	// GetTransactionResultsByBlockID returns all the transaction results for a specified block.
 	GetTransactionResultsByBlockID(ctx context.Context, blockID flow.Identifier) ([]*flow.TransactionResult, error)
 
+	// GetScheduledTransaction returns a scheduled transaction by scheduled tx ID.
+	GetScheduledTransaction(ctx context.Context, scheduledTxID uint64) (*flow.Transaction, error)
+
+	// GetScheduledTransactionResult returns the result of a scheduled transaction by scheduled tx ID.
+	GetScheduledTransactionResult(ctx context.Context, scheduledTxID uint64) (*flow.TransactionResult, error)
+
 	// GetSystemTransaction returns the system transaction for the given block ID.
 	GetSystemTransaction(ctx context.Context, blockID flow.Identifier) (*flow.Transaction, error)
 

access/grpc/client.go

@@ -216,6 +216,14 @@ func (c *Client) GetTransactionResultsByBlockID(ctx context.Context, blockID flo
 	return c.grpc.GetTransactionResultsByBlockID(ctx, blockID)
 }
 
+func (c *Client) GetScheduledTransaction(ctx context.Context, scheduledTxID uint64) (*flow.Transaction, error) {
+	return c.grpc.GetScheduledTransaction(ctx, scheduledTxID)
+}
+
+func (c *Client) GetScheduledTransactionResult(ctx context.Context, scheduledTxID uint64) (*flow.TransactionResult, error) {
+	return c.grpc.GetScheduledTransactionResult(ctx, scheduledTxID)
+}
+
 func (c *Client) SendAndSubscribeTransactionStatuses(
 	ctx context.Context,
 	tx flow.Transaction,

access/grpc/grpc.go

@@ -600,6 +600,52 @@ func (c *BaseClient) GetTransactionResultsByBlockID(
 	return results, nil
 }
 
+func (c *BaseClient) GetScheduledTransaction(
+	ctx context.Context,
+	scheduledTxID uint64,
+	opts ...grpc.CallOption,
+) (*flow.Transaction, error) {
+
+	req := &access.GetScheduledTransactionRequest{
+		Id: scheduledTxID,
+	}
+
+	res, err := c.rpcClient.GetScheduledTransaction(ctx, req, opts...)
+	if err != nil {
+		return nil, newRPCError(err)
+	}
+
+	unparsedResults := res.GetTransaction()
+	parsed, err := convert.MessageToTransaction(unparsedResults)
+	if err != nil {
+		return nil, newMessageToEntityError(entityTransaction, err)
+	}
+
+	return &parsed, nil
+}
+
+func (c *BaseClient) GetScheduledTransactionResult(
+	ctx context.Context,
+	scheduledTxID uint64,
+	opts ...grpc.CallOption,
+) (*flow.TransactionResult, error) {
+	req := &access.GetScheduledTransactionResultRequest{
+		Id: scheduledTxID,
+	}
+
+	res, err := c.rpcClient.GetScheduledTransactionResult(ctx, req, opts...)
+	if err != nil {
+		return nil, newRPCError(err)
+	}
+
+	parsed, err := convert.MessageToTransactionResult(res, c.jsonOptions)
+	if err != nil {
+		return nil, newMessageToEntityError(entityTransactionResult, err)
+	}
+
+	return &parsed, nil
+}
+
 func (c *BaseClient) GetAccount(ctx context.Context, address flow.Address, opts ...grpc.CallOption) (*flow.Account, error) {
 	return c.GetAccountAtLatestBlock(ctx, address, opts...)
 }

access/grpc/grpc_test.go

@@ -904,6 +904,85 @@ func TestClient_GetTransactionResultsByBlockID(t *testing.T) {
 	}))
 }
 
+func TestClient_GetScheduledTransaction(t *testing.T) {
+	txs := test.TransactionGenerator()
+
+	t.Run("Success", clientTest(func(t *testing.T, ctx context.Context, rpc *mocks.MockRPCClient, c *BaseClient) {
+		var scheduledTxID uint64 = 42
+		expectedTx := txs.New()
+
+		txMsg, err := convert.TransactionToMessage(*expectedTx)
+		require.NoError(t, err)
+
+		response := &access.TransactionResponse{
+			Transaction: txMsg,
+		}
+
+		rpc.On("GetScheduledTransaction", ctx, mock.Anything).Return(response, nil)
+
+		tx, err := c.GetScheduledTransaction(ctx, scheduledTxID)
+		require.NoError(t, err)
+
+		assert.Equal(t, expectedTx, tx)
+	}))
+
+	t.Run("Not found error", clientTest(func(t *testing.T, ctx context.Context, rpc *mocks.MockRPCClient, c *BaseClient) {
+		var scheduledTxID uint64 = 99
+
+		rpc.On("GetScheduledTransaction", ctx, mock.Anything).
+			Return(nil, errNotFound)
+
+		tx, err := c.GetScheduledTransaction(ctx, scheduledTxID)
+		assert.Error(t, err)
+		assert.Equal(t, codes.NotFound, status.Code(err))
+		assert.Nil(t, tx)
+	}))
+}
+
+func TestClient_GetScheduledTransactionResult(t *testing.T) {
+	t.Run("Success", clientTest(func(t *testing.T, ctx context.Context, rpc *mocks.MockRPCClient, c *BaseClient) {
+		results := test.TransactionResultGenerator(flow.EventEncodingVersionCCF)
+		var scheduledTxID uint64 = 42
+		expectedResult := results.New()
+		response, err := convert.TransactionResultToMessage(expectedResult, flow.EventEncodingVersionCCF)
+		require.NoError(t, err)
+
+		rpc.On("GetScheduledTransactionResult", ctx, mock.Anything).Return(response, nil)
+
+		result, err := c.GetScheduledTransactionResult(ctx, scheduledTxID)
+		require.NoError(t, err)
+
+		assert.Equal(t, expectedResult, *result)
+	}))
+
+	t.Run("Success with jsoncdc", clientTest(func(t *testing.T, ctx context.Context, rpc *mocks.MockRPCClient, c *BaseClient) {
+		results := test.TransactionResultGenerator(flow.EventEncodingVersionJSONCDC)
+		var scheduledTxID uint64 = 42
+		expectedResult := results.New()
+		response, err := convert.TransactionResultToMessage(expectedResult, flow.EventEncodingVersionJSONCDC)
+		require.NoError(t, err)
+
+		rpc.On("GetScheduledTransactionResult", ctx, mock.Anything).Return(response, nil)
+
+		result, err := c.GetScheduledTransactionResult(ctx, scheduledTxID)
+		require.NoError(t, err)
+
+		assert.Equal(t, expectedResult, *result)
+	}))
+
+	t.Run("Not found error", clientTest(func(t *testing.T, ctx context.Context, rpc *mocks.MockRPCClient, c *BaseClient) {
+		var scheduledTxID uint64 = 99
+
+		rpc.On("GetScheduledTransactionResult", ctx, mock.Anything).
+			Return(nil, errNotFound)
+
+		result, err := c.GetScheduledTransactionResult(ctx, scheduledTxID)
+		assert.Error(t, err)
+		assert.Equal(t, codes.NotFound, status.Code(err))
+		assert.Nil(t, result)
+	}))
+}
+
 func TestClient_GetAccountAtLatestBlock(t *testing.T) {
 	accounts := test.AccountGenerator()
 	addresses := test.AddressGenerator()

access/http/client.go

@@ -188,6 +188,14 @@ func (c *Client) GetTransactionResultsByBlockID(ctx context.Context, blockID flo
 	return nil, fmt.Errorf("not implemented")
 }
 
+func (c *Client) GetScheduledTransaction(ctx context.Context, scheduledTxID uint64) (*flow.Transaction, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
+func (c *Client) GetScheduledTransactionResult(ctx context.Context, scheduledTxID uint64) (*flow.TransactionResult, error) {
+	return nil, fmt.Errorf("not implemented")
+}
+
 func (c *Client) GetSystemTransaction(ctx context.Context, blockID flow.Identifier) (*flow.Transaction, error) {
 	return nil, fmt.Errorf("not implemented")
 }