Skip to content

refactor: warp e2e tests no longer in single function #4798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maru-ava merged 9 commits into from
Jan 7, 2026
Merged

refactor: warp e2e tests no longer in single function #4798

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a5ec5f4
refactor: warp e2e tests no longer in single function
JonathanOppenheimer Dec 31, 2025
8e0262f
fix: return as functions instead
JonathanOppenheimer Dec 31, 2025
700b55d
fix: have create its own context
JonathanOppenheimer Jan 2, 2026
766abee
Merge branch 'master' into JonathanOppenheimer/refactor-warp-e2e
JonathanOppenheimer Jan 2, 2026
994bd56
Merge branch 'master' into JonathanOppenheimer/refactor-warp-e2e
JonathanOppenheimer Jan 5, 2026
49539eb
test: simplify logging
JonathanOppenheimer Jan 6, 2026
4fe2939
test: simplify logging
JonathanOppenheimer Jan 6, 2026
fe30b29
Merge branch 'master' into JonathanOppenheimer/refactor-warp-e2e
JonathanOppenheimer Jan 6, 2026
8f4134c
fix: revert full wrap
JonathanOppenheimer Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 33 additions & 22 deletions graft/coreth/tests/warp/warp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,32 +121,41 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
})

var _ = ginkgo.Describe("[Warp]", func() {
testFunc := func(sendingSubnet *Subnet, receivingSubnet *Subnet) {
tc := e2e.NewTestContext()
w := newWarpTest(tc.DefaultContext(), sendingSubnet, receivingSubnet)
type testCombination struct {
name string
sendingSubnet func() *Subnet
receivingSubnet func() *Subnet
}

testCombinations := []testCombination{
// TODO: Uncomment these tests when we have a way to run them in CI, currently we should not depend on Subnet-EVM
// as Coreth and Subnet-EVM have different release cycles. The problem is that once we update AvalancheGo (protocol version),
// we need to update Subnet-EVM to the same protocol version. Until then all Subnet-EVM tests are broken, so it's blocking Coreth development.
// It's best to not run these tests until we have a way to run them in CI.
// {"SubnetA -> C-Chain", func() *Subnet { return subnetA }, func() *Subnet { return cChainSubnetDetails }},
// {"C-Chain -> SubnetA", func() *Subnet { return cChainSubnetDetails }, func() *Subnet { return subnetA }},
{"C-Chain -> C-Chain", func() *Subnet { return cChainSubnetDetails }, func() *Subnet { return cChainSubnetDetails }},
}

for _, combination := range testCombinations {
ginkgo.Describe(combination.name, ginkgo.Ordered, func() {
var w *warpTest

ginkgo.BeforeAll(func() {
w = newWarpTest(combination.sendingSubnet(), combination.receivingSubnet())
})

ginkgo.GinkgoLogr.Info("Sending message from A to B")
w.sendMessageFromSendingSubnet()
ginkgo.It("should send warp message from sending subnet", w.sendMessageFromSendingSubnet)

ginkgo.GinkgoLogr.Info("Aggregating signatures via API")
w.aggregateSignaturesViaAPI()
ginkgo.It("should aggregate signatures via API", w.aggregateSignaturesViaAPI)

ginkgo.GinkgoLogr.Info("Delivering addressed call payload to receiving subnet")
w.deliverAddressedCallToReceivingSubnet()
ginkgo.It("should deliver addressed call payload to receiving subnet", w.deliverAddressedCallToReceivingSubnet)

ginkgo.GinkgoLogr.Info("Delivering block hash payload to receiving subnet")
w.deliverBlockHashPayload()
ginkgo.It("should deliver block hash payload", w.deliverBlockHashPayload)

ginkgo.GinkgoLogr.Info("Executing warp load test")
w.warpLoad()
ginkgo.It("should handle warp load testing", w.warpLoad)
})
}
// TODO: Uncomment these tests when we have a way to run them in CI, currently we should not depend on Subnet-EVM
// as Coreth and Subnet-EVM have different release cycles. The problem is that once we update AvalancheGo (protocol version),
// we need to update Subnet-EVM to the same protocol version. Until then all Subnet-EVM tests are broken, so it's blocking Coreth development.
// It's best to not run these tests until we have a way to run them in CI.
// ginkgo.It("SubnetA -> C-Chain", func() { testFunc(subnetA, cChainSubnetDetails) })
// ginkgo.It("C-Chain -> SubnetA", func() { testFunc(cChainSubnetDetails, subnetA) })
ginkgo.It("C-Chain -> C-Chain", func() { testFunc(cChainSubnetDetails, cChainSubnetDetails) })
})

type warpTest struct {
Expand Down Expand Up @@ -178,8 +187,10 @@ type warpTest struct {
addressedCallSignedMessage *avalancheWarp.Message
}

func newWarpTest(ctx context.Context, sendingSubnet *Subnet, receivingSubnet *Subnet) *warpTest {
func newWarpTest(sendingSubnet *Subnet, receivingSubnet *Subnet) *warpTest {
require := require.New(ginkgo.GinkgoT())
tc := e2e.NewTestContext()
ctx := tc.DefaultContext()

sendingSubnetFundedKey := sendingSubnet.PreFundedKey
receivingSubnetFundedKey := receivingSubnet.PreFundedKey
Expand Down Expand Up @@ -240,9 +251,9 @@ func (w *warpTest) initClients() {
}

func (w *warpTest) sendMessageFromSendingSubnet() {
require := require.New(ginkgo.GinkgoT())
tc := e2e.NewTestContext()
ctx := tc.DefaultContext()
require := require.New(ginkgo.GinkgoT())

client := w.sendingSubnetClients[0]

Expand Down
81 changes: 55 additions & 26 deletions graft/subnet-evm/tests/warp/warp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,33 +154,59 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
})

var _ = ginkgo.Describe("[Warp]", func() {
testFunc := func(sendingSubnet *Subnet, receivingSubnet *Subnet) {
tc := e2e.NewTestContext()
w := newWarpTest(tc.DefaultContext(), sendingSubnet, receivingSubnet)

log.Info("Sending message from A to B")
w.sendMessageFromSendingSubnet()

log.Info("Aggregating signatures via API")
w.aggregateSignaturesViaAPI()

log.Info("Delivering addressed call payload to receiving subnet")
w.deliverAddressedCallToReceivingSubnet()

log.Info("Delivering block hash payload to receiving subnet")
w.deliverBlockHashPayload()
type testCombination struct {
name string
sendingSubnet func() *Subnet
receivingSubnet func() *Subnet
}

log.Info("bindings test: verifying warp message and blockchain ID")
w.warpBindingsTest()
testCombinations := []testCombination{
{"SubnetA -> SubnetB", func() *Subnet { return subnetA }, func() *Subnet { return subnetB }},
{"SubnetA -> SubnetA", func() *Subnet { return subnetA }, func() *Subnet { return subnetA }},
{"SubnetA -> C-Chain", func() *Subnet { return subnetA }, func() *Subnet { return cChainSubnetDetails }},
{"C-Chain -> SubnetA", func() *Subnet { return cChainSubnetDetails }, func() *Subnet { return subnetA }},
{"C-Chain -> C-Chain", func() *Subnet { return cChainSubnetDetails }, func() *Subnet { return cChainSubnetDetails }},
}

log.Info("Executing warp load test")
w.warpLoad()
for _, combination := range testCombinations {
ginkgo.Describe(combination.name, ginkgo.Ordered, func() {
var w *warpTest

ginkgo.BeforeAll(func() {
w = newWarpTest(combination.sendingSubnet(), combination.receivingSubnet())
})

ginkgo.It("should send warp message from sending subnet", func() {
log.Info("Sending message from sending subnet")
w.sendMessageFromSendingSubnet()
})

ginkgo.It("should aggregate signatures via API", func() {
log.Info("Aggregating signatures via API")
w.aggregateSignaturesViaAPI()
})

ginkgo.It("should deliver addressed call payload to receiving subnet", func() {
log.Info("Delivering addressed call payload to receiving subnet")
w.deliverAddressedCallToReceivingSubnet()
})

ginkgo.It("should deliver block hash payload", func() {
log.Info("Delivering block hash payload to receiving subnet")
w.deliverBlockHashPayload()
})

ginkgo.It("should verify warp bindings", func() {
log.Info("bindings test: verifying warp message and blockchain ID")
w.warpBindingsTest()
})

ginkgo.It("should handle warp load testing", func() {
log.Info("Executing warp load test")
w.warpLoad()
})
})
}
ginkgo.It("SubnetA -> SubnetB", func() { testFunc(subnetA, subnetB) })
ginkgo.It("SubnetA -> SubnetA", func() { testFunc(subnetA, subnetA) })
ginkgo.It("SubnetA -> C-Chain", func() { testFunc(subnetA, cChainSubnetDetails) })
ginkgo.It("C-Chain -> SubnetA", func() { testFunc(cChainSubnetDetails, subnetA) })
ginkgo.It("C-Chain -> C-Chain", func() { testFunc(cChainSubnetDetails, cChainSubnetDetails) })
})

type warpTest struct {
Expand Down Expand Up @@ -212,8 +238,10 @@ type warpTest struct {
addressedCallSignedMessage *avalancheWarp.Message
}

func newWarpTest(ctx context.Context, sendingSubnet *Subnet, receivingSubnet *Subnet) *warpTest {
func newWarpTest(sendingSubnet *Subnet, receivingSubnet *Subnet) *warpTest {
require := require.New(ginkgo.GinkgoT())
tc := e2e.NewTestContext()
ctx := tc.DefaultContext()

sendingSubnetFundedKey := sendingSubnet.PreFundedKey
receivingSubnetFundedKey := receivingSubnet.PreFundedKey
Expand Down Expand Up @@ -288,9 +316,10 @@ func (*warpTest) getBlockHashAndNumberFromTxReceipt(ctx context.Context, client
}

func (w *warpTest) sendMessageFromSendingSubnet() {
require := require.New(ginkgo.GinkgoT())
tc := e2e.NewTestContext()
ctx := tc.DefaultContext()
require := require.New(ginkgo.GinkgoT())

client := w.sendingSubnetClients[0]

blockHash, blockNumber := w.sendWarpMessageTx(ctx, client)
Expand Down
Loading