Skip to content

Commit fd5e279

Browse files
committed
Updated E2E tests
1 parent 2a3614f commit fd5e279

7 files changed

Lines changed: 25 additions & 25 deletions

File tree

Dockerfile.simple

Lines changed: 0 additions & 3 deletions
This file was deleted.

integration-tests/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/rs/zerolog v1.33.0
1313
github.com/smartcontractkit/chainlink-common v0.8.1-0.20250730004800-27955557aca6
1414
github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.1
15-
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250701132001-f8be142155b6
15+
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20250804130351-2a3614fc03cc
1616
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250428183335-14ac746cbe81
1717
github.com/smartcontractkit/chainlink/v2 v2.23.2-por-beta.1.0.20250729150432-5ea4a324a49b
1818
github.com/smartcontractkit/libocr v0.0.0-20250707144819-babe0ec4e358
@@ -251,10 +251,10 @@ require (
251251
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.1 // indirect
252252
github.com/smartcontractkit/chainlink-common/pkg/values v0.0.0-20250718143957-41236f9ef8b4 // indirect
253253
github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk/v2/pb v0.0.0-20250718160737-52367713623f // indirect
254-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250717140849-58bcb2816c08 // indirect
254+
github.com/smartcontractkit/chainlink-evm v0.1.1-0.20250804133850-d8e2f43db387 // indirect
255255
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2 // indirect
256-
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e // indirect
257-
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a // indirect
256+
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2 // indirect
257+
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d // indirect
258258
github.com/smartcontractkit/chainlink-protos/svr v1.1.0 // indirect
259259
github.com/smartcontractkit/freeport v0.1.1 // indirect
260260
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect

integration-tests/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -929,18 +929,18 @@ github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk/v2/pb v0.0.0-2025
929929
github.com/smartcontractkit/chainlink-common/pkg/workflows/sdk/v2/pb v0.0.0-20250718160737-52367713623f/go.mod h1:LEZQ/SbFHseQJrLKVm6ELB8gyI4G8rVEH3SQzzZqFDk=
930930
github.com/smartcontractkit/chainlink-data-streams v0.1.2 h1:g/UmFJa/E1Zmc7NO20ob5SijxQen51DhnqTLr2f7BEc=
931931
github.com/smartcontractkit/chainlink-data-streams v0.1.2/go.mod h1:lxY97sDlDorQAmLGFo6x1tl8SQ2E7adsS0/wU8+mmTc=
932-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250717140849-58bcb2816c08 h1:CppYDovAiyJz+D14jtaci8wuHnumHTB2lQ68LamGbdg=
933-
github.com/smartcontractkit/chainlink-evm v0.0.0-20250717140849-58bcb2816c08/go.mod h1:c+0Vwbh3whz8SUxRvsYiOkbuQUlK1ckyQ49HTNUjJcI=
932+
github.com/smartcontractkit/chainlink-evm v0.1.1-0.20250804133850-d8e2f43db387 h1:tGOOqInwufJzE1Orbs5rTEPYv7KEiCDIMIrtuEi4QDo=
933+
github.com/smartcontractkit/chainlink-evm v0.1.1-0.20250804133850-d8e2f43db387/go.mod h1:DAcHXKZjbLVrqAMCWUXWfULLLdu0KSF2R4LvdvY92q8=
934934
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 h1:8u9xUrC+yHrTDexOKDd+jrA6LCzFFHeX1G82oj2fsSI=
935935
github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135/go.mod h1:NkvE4iQgiT7dMCP6U3xPELHhWhN5Xr6rHC0axRebyMU=
936936
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250702183345-3f9ae622e391 h1:4dUBtClcoG6QHY2JYqkpZ3GLL6DUX6pVP52wb7qVY48=
937937
github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20250702183345-3f9ae622e391/go.mod h1:GSz65mYV8hzb8LCRhbhoVn4i3el87nrXTBQE8KF1Qao=
938938
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2 h1:JU1JUrkzdAUHsOYdS9DENPkJfmrxweFRPRSztad6oPM=
939939
github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20250717121125-2350c82883e2/go.mod h1:+pRGfDej1r7cHMs1dYmuyPuOZzYB9Q+PKu0FvZOYlmw=
940-
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e h1:LRT+PltY99+hxZAJn+4nyTfqGVNEM1S6FJ675B9BtJo=
941-
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250618135814-7e3f79ab707e/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
942-
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a h1:O28vgyHM7QF1YLg1BwkQSIbOYA+t0RiH9+b+k90GPG8=
943-
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250522110034-65c54665034a/go.mod h1:zYqPBBRUXUQ/L+aD4Q7phnYsfVeC5rDBXtPt1VYwtws=
940+
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2 h1:ysZjKH+BpWlQhF93kr/Lc668UlCvT9NjfcsGdZT19I8=
941+
github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20250717121125-2350c82883e2/go.mod h1:jo+cUqNcHwN8IF7SInQNXDZ8qzBsyMpnLdYbDswviFc=
942+
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d h1:pTYIcsWHTMG5fAcbRUA8Qk5yscXKdSpopQ0DUEOjPik=
943+
github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20250729142306-508e798f6a5d/go.mod h1:2JTBNp3FlRdO/nHc4dsc9bfxxMClMO1Qt8sLJgtreBY=
944944
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722175102-6dcdf5122683 h1:Qjiw8yaKi42jjknW1+ox6+QHc4aJVm0uhVoKTlmZryU=
945945
github.com/smartcontractkit/chainlink-protos/billing/go v0.0.0-20250722175102-6dcdf5122683/go.mod h1:HHGeDUpAsPa0pmOx7wrByCitjQ0mbUxf0R9v+g67uCA=
946946
github.com/smartcontractkit/chainlink-protos/orchestrator v0.8.1 h1:VcFo27MBPTMB1d1Tp3q3RzJNqwErKR+z9QLQZ6KBSXo=

integration-tests/ocr2_local_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,11 @@ func runOCR2Test(
9898
require.NoError(t, err, "Could not create relay logger")
9999

100100
testKeystore := testutils.NewTestKeystore(pubAddress.String(), privateKey)
101-
txmgr := txm.New(clientLogger, testKeystore, combinedClient.FullNodeClient(), txm.TronTxmConfig{
101+
txmgr := txm.New(clientLogger, testKeystore, combinedClient, txm.TronTxmConfig{
102102
BroadcastChanSize: 100,
103103
ConfirmPollSecs: 2,
104+
RetentionPeriod: 8 * time.Minute,
105+
ReapInterval: 10 * time.Second,
104106
})
105107
err = txmgr.Start(context.Background())
106108
require.NoError(t, err)
@@ -149,10 +151,10 @@ func runOCR2Test(
149151
deployContract := func(contractName string, artifact *contract.Artifact, params []interface{}) address.Address {
150152
txHash := testutils.SignAndDeployContract(t, combinedClient, testKeystore, pubAddress, contractName, artifact.AbiJson, artifact.Bytecode, feeLimit, params)
151153
// use full node client for quicker feedback
152-
txInfo := testutils.WaitForTransactionInfo(t, combinedClient.FullNodeClient(), txHash, txnWaitTime)
154+
txInfo := testutils.WaitForTransactionInfo(t, combinedClient, txHash, txnWaitTime)
153155
contractAddress, err := address.StringToAddress(txInfo.ContractAddress)
154156
require.NoError(t, err)
155-
contractDeployed := testutils.CheckContractDeployed(t, combinedClient.FullNodeClient(), contractAddress)
157+
contractDeployed := testutils.CheckContractDeployed(t, combinedClient, contractAddress)
156158
require.True(t, contractDeployed, "Contract not deployed")
157159
return contractAddress
158160
}

relayer/cmd/chainlink-tron/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ in
1818
];
1919

2020
# pin the vendor hash (update using 'pkgs.lib.fakeHash')
21-
vendorHash = "sha256-2esJryFB5ghbOY/LWkTtHA9vd2M9I1MEwImp1ttTt5M=";
21+
vendorHash = "sha256-pYy4CwYI9ID5+9+5coZqQyMbdu7LMD/ufvCHzqPfjao=";
2222

2323
# postInstall script to write version and rev to share folder
2424
postInstall = ''

relayer/go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ require (
5555
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
5656
github.com/gofrs/uuid v4.4.0+incompatible // indirect
5757
github.com/golang/protobuf v1.5.4 // indirect
58+
github.com/golang/snappy v1.0.0 // indirect
5859
github.com/google/go-cmp v0.7.0 // indirect
5960
github.com/gorilla/websocket v1.5.3 // indirect
6061
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
@@ -110,8 +111,8 @@ require (
110111
github.com/stretchr/objx v0.5.2 // indirect
111112
github.com/supranational/blst v0.3.14 // indirect
112113
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
113-
github.com/tklauser/go-sysconf v0.3.13 // indirect
114-
github.com/tklauser/numcpus v0.7.0 // indirect
114+
github.com/tklauser/go-sysconf v0.3.15 // indirect
115+
github.com/tklauser/numcpus v0.10.0 // indirect
115116
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
116117
github.com/x448/float16 v0.8.4 // indirect
117118
github.com/yusufpapurcu/wmi v1.2.4 // indirect

relayer/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
156156
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
157157
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
158158
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
159-
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
160-
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
159+
github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
160+
github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
161161
github.com/google/flatbuffers v25.2.10+incompatible h1:F3vclr7C3HpB1k9mxCGRMXq6FdUalZ6H/pNX4FP1v0Q=
162162
github.com/google/flatbuffers v25.2.10+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
163163
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -442,10 +442,10 @@ github.com/supranational/blst v0.3.14 h1:xNMoHRJOTwMn63ip6qoWJ2Ymgvj7E2b9jY2FAwY
442442
github.com/supranational/blst v0.3.14/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
443443
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
444444
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
445-
github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
446-
github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
447-
github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
448-
github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
445+
github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
446+
github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
447+
github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
448+
github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
449449
github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
450450
github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
451451
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=

0 commit comments

Comments
 (0)