Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit 2d45cec

Browse files
committed
lint
1 parent 8e7d7c3 commit 2d45cec

File tree

2 files changed

+25
-18
lines changed

2 files changed

+25
-18
lines changed

chain/block_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package chain
55

66
import (
7+
"context"
78
"errors"
89
"testing"
910
"time"
@@ -150,7 +151,7 @@ func TestBlock(t *testing.T) {
150151
}
151152
for i, tv := range tt {
152153
blk := tv.createBlk()
153-
err := blk.Verify()
154+
err := blk.Verify(context.Background())
154155
if !errors.Is(err, tv.expectedVerifyErr) {
155156
t.Fatalf("#%d: block verify expected error %v, got %v", i, tv.expectedVerifyErr, err)
156157
}

tests/integration/integration_test.go

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ var _ = ginkgo.BeforeSuite(func() {
154154
// TODO: test appsender
155155
v := &vm.VM{AirdropData: airdropData}
156156
err := v.Initialize(
157+
context.Background(),
157158
ctx,
158159
db,
159160
genesisBytes,
@@ -172,7 +173,7 @@ var _ = ginkgo.BeforeSuite(func() {
172173
})
173174

174175
var hd map[string]*common.HTTPHandler
175-
hd, err = v.CreateHandlers()
176+
hd, err = v.CreateHandlers(context.Background())
176177
gomega.Ω(err).Should(gomega.BeNil())
177178

178179
httpServer := httptest.NewServer(hd[vm.PublicEndpoint].Handler)
@@ -207,7 +208,7 @@ var _ = ginkgo.BeforeSuite(func() {
207208
var _ = ginkgo.AfterSuite(func() {
208209
for _, iv := range instances {
209210
iv.httpServer.Close()
210-
err := iv.vm.Shutdown()
211+
err := iv.vm.Shutdown(context.Background())
211212
gomega.Ω(err).Should(gomega.BeNil())
212213
}
213214
})
@@ -297,19 +298,21 @@ var _ = ginkgo.Describe("Tx Types", func() {
297298
})
298299

299300
ginkgo.By("build block in the node 1", func() {
300-
blk, err := instances[1].vm.BuildBlock()
301+
ctx := context.Background()
302+
303+
blk, err := instances[1].vm.BuildBlock(ctx)
301304
gomega.Ω(err).To(gomega.BeNil())
302305

303-
gomega.Ω(blk.Verify()).To(gomega.BeNil())
306+
gomega.Ω(blk.Verify(ctx)).To(gomega.BeNil())
304307
gomega.Ω(blk.Status()).To(gomega.Equal(choices.Processing))
305308

306-
err = instances[1].vm.SetPreference(blk.ID())
309+
err = instances[1].vm.SetPreference(ctx, blk.ID())
307310
gomega.Ω(err).To(gomega.BeNil())
308311

309-
gomega.Ω(blk.Accept()).To(gomega.BeNil())
312+
gomega.Ω(blk.Accept(ctx)).To(gomega.BeNil())
310313
gomega.Ω(blk.Status()).To(gomega.Equal(choices.Accepted))
311314

312-
lastAccepted, err := instances[1].vm.LastAccepted()
315+
lastAccepted, err := instances[1].vm.LastAccepted(ctx)
313316
gomega.Ω(err).To(gomega.BeNil())
314317
gomega.Ω(lastAccepted).To(gomega.Equal(blk.ID()))
315318
})
@@ -710,6 +713,7 @@ func createIssueTx(i instance, input *chain.Input, signer *ecdsa.PrivateKey) {
710713
}
711714

712715
func asyncBlockPush(i instance, c chan struct{}) {
716+
ctx := context.Background()
713717
timer := time.NewTicker(500 * time.Millisecond)
714718
for {
715719
select {
@@ -721,21 +725,21 @@ func asyncBlockPush(i instance, c chan struct{}) {
721725
// manually ack ready sig as in engine
722726
<-i.toEngine
723727

724-
blk, err := i.vm.BuildBlock()
728+
blk, err := i.vm.BuildBlock(ctx)
725729
if err != nil {
726730
continue
727731
}
728732

729-
gomega.Ω(blk.Verify()).To(gomega.BeNil())
733+
gomega.Ω(blk.Verify(ctx)).To(gomega.BeNil())
730734
gomega.Ω(blk.Status()).To(gomega.Equal(choices.Processing))
731735

732-
err = i.vm.SetPreference(blk.ID())
736+
err = i.vm.SetPreference(ctx, blk.ID())
733737
gomega.Ω(err).To(gomega.BeNil())
734738

735-
gomega.Ω(blk.Accept()).To(gomega.BeNil())
739+
gomega.Ω(blk.Accept(ctx)).To(gomega.BeNil())
736740
gomega.Ω(blk.Status()).To(gomega.Equal(choices.Accepted))
737741

738-
lastAccepted, err := i.vm.LastAccepted()
742+
lastAccepted, err := i.vm.LastAccepted(ctx)
739743
gomega.Ω(err).To(gomega.BeNil())
740744
gomega.Ω(lastAccepted).To(gomega.Equal(blk.ID()))
741745
}
@@ -748,19 +752,21 @@ func expectBlkAccept(i instance) {
748752
// manually ack ready sig as in engine
749753
<-i.toEngine
750754

751-
blk, err := i.vm.BuildBlock()
755+
ctx := context.Background()
756+
757+
blk, err := i.vm.BuildBlock(ctx)
752758
gomega.Ω(err).To(gomega.BeNil())
753759

754-
gomega.Ω(blk.Verify()).To(gomega.BeNil())
760+
gomega.Ω(blk.Verify(ctx)).To(gomega.BeNil())
755761
gomega.Ω(blk.Status()).To(gomega.Equal(choices.Processing))
756762

757-
err = i.vm.SetPreference(blk.ID())
763+
err = i.vm.SetPreference(ctx, blk.ID())
758764
gomega.Ω(err).To(gomega.BeNil())
759765

760-
gomega.Ω(blk.Accept()).To(gomega.BeNil())
766+
gomega.Ω(blk.Accept(ctx)).To(gomega.BeNil())
761767
gomega.Ω(blk.Status()).To(gomega.Equal(choices.Accepted))
762768

763-
lastAccepted, err := i.vm.LastAccepted()
769+
lastAccepted, err := i.vm.LastAccepted(ctx)
764770
gomega.Ω(err).To(gomega.BeNil())
765771
gomega.Ω(lastAccepted).To(gomega.Equal(blk.ID()))
766772
}

0 commit comments

Comments
 (0)