Skip to content

Commit d3b85b0

Browse files
Patricio Tourne Passarinoduck-types
authored andcommitted
fix: integration-tests
1 parent cbea168 commit d3b85b0

5 files changed

Lines changed: 35 additions & 31 deletions

File tree

integration-tests/deployment/ccip/cs_add_lanes_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ import (
1111

1212
"github.com/Masterminds/semver/v3"
1313
chainselectors "github.com/smartcontractkit/chain-selectors"
14+
"github.com/stretchr/testify/require"
15+
1416
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/mcms"
1517
commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
16-
"github.com/stretchr/testify/require"
1718

1819
"github.com/smartcontractkit/chainlink-ton/deployment/utils/sequence"
1920

@@ -75,7 +76,7 @@ func TestAddLanes(t *testing.T) {
7576
},
7677
})
7778
require.NoError(t, err, "Failed to apply DeployChainContracts changeset")
78-
_ = out.DataStore.Merge(env.DataStore)
79+
require.NoError(t, out.DataStore.Merge(env.DataStore))
7980
env.DataStore = out.DataStore.Seal()
8081

8182
// Get OnRamp Address from EVM

integration-tests/deployment/ccip/cs_fast_curse_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import (
77

88
"github.com/Masterminds/semver/v3"
99
chainselectors "github.com/smartcontractkit/chain-selectors"
10+
"github.com/stretchr/testify/require"
11+
1012
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/mcms"
1113
commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
12-
"github.com/stretchr/testify/require"
1314

1415
"github.com/smartcontractkit/chainlink-ton/deployment/utils/sequence"
1516

@@ -70,7 +71,7 @@ func TestFastCurseTON(t *testing.T) {
7071
},
7172
})
7273
require.NoError(t, err, "Failed to apply DeployChainContracts changeset")
73-
_ = out.DataStore.Merge(env.DataStore)
74+
require.NoError(t, out.DataStore.Merge(env.DataStore))
7475
env.DataStore = out.DataStore.Seal()
7576
// </deploy-evm>
7677

integration-tests/monitor/balance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func TestBalanceMonitor_Polling(t *testing.T) {
150150
err = balanceMonitor.Start(t.Context())
151151
require.NoError(t, err)
152152
defer func() {
153-
_ = balanceMonitor.Close()
153+
require.NoError(t, balanceMonitor.Close())
154154
}()
155155

156156
// Wait a bit to allow the monitor to poll at least once

integration-tests/smoke/chainaccessor/accessor_test.go

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ func Test_TonAccessor_MsgsBetweenSeqNums(t *testing.T) {
147147
func Test_TonAccessorCommitEventQueries(t *testing.T) {
148148
// Note: we don't test the API client interaction here, so we return empty client
149149
clientProvider := func(ctx context.Context) (ton.APIClientWrapped, error) {
150+
//nolint:nilnil // mock
150151
return nil, nil
151152
}
152153

@@ -639,7 +640,8 @@ func testCommitReportsBasicHelper(t *testing.T, lp logpoller.Service, logStore l
639640
require.Equal(t, ccipocr3.SeqNum(1), merkleRoot.SeqNumsRange.Start(), "MinSeqNr should be 1")
640641
require.Equal(t, ccipocr3.SeqNum(1), merkleRoot.SeqNumsRange.End(), "MaxSeqNr should be 1")
641642

642-
expectedMerkleRootBytes, _ := hex.DecodeString("bea275bb6614f85036536bc670e540bc748118e90537b8441c950672f74607d5")
643+
expectedMerkleRootBytes, err := hex.DecodeString("bea275bb6614f85036536bc670e540bc748118e90537b8441c950672f74607d5")
644+
require.NoError(t, err)
643645
require.Equal(t, expectedMerkleRootBytes, merkleRoot.MerkleRoot[:], "MerkleRoot should match")
644646

645647
// Validate PriceUpdates should be empty for this test (since we used merkleRootOnlyCell)
@@ -695,11 +697,6 @@ func Test_TonAccessorExecutionStateChangedEventQueries(t *testing.T) {
695697
}
696698

697699
func Test_TonAccessorExecutedMessages(t *testing.T) {
698-
// Note: we don't test the API client interaction here, so we return empty client
699-
clientProvider := func(ctx context.Context) (ton.APIClientWrapped, error) {
700-
return nil, nil
701-
}
702-
703700
// Setup in-memory store
704701
lggr := logger.Test(t)
705702
opts := &logpoller.ServiceOptions{
@@ -711,7 +708,8 @@ func Test_TonAccessorExecutedMessages(t *testing.T) {
711708
lp, err := logpoller.NewService(
712709
lggr,
713710
"test-chain",
714-
clientProvider,
711+
// Note: we don't test the API client interaction here, so we return empty client
712+
mockClientProvider,
715713
opts,
716714
)
717715
require.NoError(t, err)
@@ -720,15 +718,15 @@ func Test_TonAccessorExecutedMessages(t *testing.T) {
720718
testExecutedMessagesHelper(t, lp, opts.LogStore, 1)
721719
}
722720

721+
func mockClientProvider(ctx context.Context) (ton.APIClientWrapped, error) {
722+
//nolint:nilnil // mock
723+
return nil, nil
724+
}
725+
723726
// Test validation for MsgsBetweenSeqNums sequence number range
724727
func Test_TonAccessor_MsgsBetweenSeqNums_SequenceRangeValidation(t *testing.T) {
725728
lggr := logger.Test(t)
726729

727-
// Note: we don't test the API client interaction here, so we return empty client
728-
clientProvider := func(ctx context.Context) (ton.APIClientWrapped, error) {
729-
return nil, nil
730-
}
731-
732730
opts := &logpoller.ServiceOptions{
733731
Config: logpoller.DefaultConfigSet,
734732
FilterStore: inmemorystore.NewFilterStore("test-chain", lggr),
@@ -738,7 +736,8 @@ func Test_TonAccessor_MsgsBetweenSeqNums_SequenceRangeValidation(t *testing.T) {
738736
lp, err := logpoller.NewService(
739737
lggr,
740738
"test-chain",
741-
clientProvider,
739+
// Note: we don't test the API client interaction here, so we return empty client
740+
mockClientProvider,
742741
opts,
743742
)
744743
require.NoError(t, err)
@@ -788,11 +787,6 @@ func Test_TonAccessorExecutedMessages_WithPostgresStore(t *testing.T) {
788787
t.Skip("Skipping postgres test in short mode")
789788
}
790789

791-
// Note: we don't test the API client interaction here, so we return empty client
792-
clientProvider := func(ctx context.Context) (ton.APIClientWrapped, error) {
793-
return nil, nil
794-
}
795-
796790
// Setup postgres store using testcontainers
797791
lggr := logger.Test(t)
798792
ds := pgtest.SetupTestDB(t)
@@ -814,7 +808,8 @@ func Test_TonAccessorExecutedMessages_WithPostgresStore(t *testing.T) {
814808
lp, err := logpoller.NewService(
815809
lggr,
816810
"test-chain",
817-
clientProvider,
811+
// Note: we don't test the API client interaction here, so we return empty client
812+
mockClientProvider,
818813
opts,
819814
)
820815
require.NoError(t, err)

integration-tests/smoke/logpoller/log_poller_test.go

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ func Test_LogPoller(t *testing.T) {
107107

108108
indexedCells := make([]*cell.Cell, 0, len(txs))
109109
for _, tx := range txs {
110-
msgs, _ := tx.Transaction.IO.Out.ToSlice()
110+
msgs, serr := tx.Transaction.IO.Out.ToSlice()
111+
require.NoError(t, serr)
111112
for _, msg := range msgs {
112113
// test contract only emits ExternalMessageOut
113114
if msg.MsgType == tlb.MsgTypeExternalOut {
@@ -152,7 +153,8 @@ func Test_LogPoller(t *testing.T) {
152153

153154
// Extract messages from the loaded transactions
154155
for _, tx := range txs {
155-
msgs, _ := tx.Transaction.IO.Out.ToSlice()
156+
msgs, serr := tx.Transaction.IO.Out.ToSlice()
157+
require.NoError(t, serr)
156158
for _, msg := range msgs {
157159
if msg.MsgType == tlb.MsgTypeExternalOut {
158160
if extOut := msg.AsExternalOut(); extOut != nil {
@@ -894,7 +896,8 @@ func Test_LogPoller(t *testing.T) {
894896
return counterValue == preReplayEvents
895897
}, 30*time.Second, 1*time.Second, "counter should reach expected value")
896898

897-
counterValue, _ := counter.GetValue(t.Context(), tonChain.Client, emitter.ContractAddress())
899+
counterValue, err := counter.GetValue(t.Context(), tonChain.Client, emitter.ContractAddress())
900+
require.NoError(t, err)
898901
require.Equal(t, preReplayEvents, int(counterValue))
899902

900903
// 3. Start LogPoller (with in-memory stores)
@@ -922,10 +925,11 @@ func Test_LogPoller(t *testing.T) {
922925
defer func() { require.NoError(t, lp.Close()) }()
923926

924927
// 5. Verify no logs before replay
925-
logs, _, _, _ := lp.NewQuery().
928+
logs, _, _, err := lp.NewQuery().
926929
WithSource(emitter.ContractAddress()).
927930
WithEventSig(counter.TopicCountIncreased).
928931
Execute(t.Context())
932+
require.NoError(t, err)
929933
require.Empty(t, logs, "should have no logs before replay")
930934

931935
// 6. Request replay from block before events were emitted
@@ -956,7 +960,8 @@ func Test_LogPoller(t *testing.T) {
956960
return false
957961
}
958962

959-
result, _ := query.DecodedLogs[counter.CountIncreased](logs)
963+
result, serr := query.DecodedLogs[counter.CountIncreased](logs)
964+
require.NoError(t, serr)
960965
t.Logf("found %d logs after replay", len(result))
961966
return len(result) == preReplayEvents
962967
}, 60*time.Second, 2*time.Second, "replay should complete and index all events")
@@ -969,11 +974,13 @@ func Test_LogPoller(t *testing.T) {
969974
}
970975

971976
require.Eventually(t, func() bool {
972-
logs, _, _, _ := lp.NewQuery().
977+
logs, _, _, err := lp.NewQuery().
973978
WithSource(emitter.ContractAddress()).
974979
WithEventSig(counter.TopicCountIncreased).
975980
Execute(t.Context())
976-
result, _ := query.DecodedLogs[counter.CountIncreased](logs)
981+
require.NoError(t, err)
982+
result, err := query.DecodedLogs[counter.CountIncreased](logs)
983+
require.NoError(t, err)
977984
return len(result) == preReplayEvents+postReplayEvents
978985
}, 30*time.Second, 2*time.Second, "should index new events after replay")
979986
})

0 commit comments

Comments
 (0)