Skip to content

Commit f5f0802

Browse files
ta0lita0li
committed
fix ci
1 parent 2ac04ef commit f5f0802

33 files changed

+195
-175
lines changed

‎app/node/test/setup.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func CreateBootstrapMiner(ctx context.Context, t *testing.T, seed *ChainSeed, ch
4747
WithBuilderOpt(node.MonkeyPatchSetProofTypeOption(constants.DevRegisteredSealProof)).
4848
Build(ctx)
4949

50-
addr := seed.GiveKey(t, bootstrapMiner, 0)
50+
addr := seed.GiveKey(ctx, t, bootstrapMiner, 0)
5151
err := bootstrapMiner.ConfigModule().API().ConfigSet(ctx, "walletModule.defaultAddress", addr.String())
5252
require.NoError(t, err)
5353

@@ -60,7 +60,7 @@ func CreateBootstrapMiner(ctx context.Context, t *testing.T, seed *ChainSeed, ch
6060
}
6161

6262
func initNodeGenesisMiner(ctx context.Context, t *testing.T, nd *node.Node, seed *ChainSeed, minerIdx int) (address.Address, address.Address, error) {
63-
seed.GiveKey(t, nd, minerIdx)
63+
seed.GiveKey(ctx, t, nd, minerIdx)
6464
miner, owner := seed.GiveMiner(t, nd, 0)
6565

6666
return miner, owner, nil

‎cmd/address_integration_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestAddressNewAndList(t *testing.T) {
3333
addrs := make([]address.Address, 10)
3434
var err error
3535
for i := 0; i < 10; i++ {
36-
addrs[i], err = n.Wallet().API().WalletNewAddress(address.SECP256K1)
36+
addrs[i], err = n.Wallet().API().WalletNewAddress(ctx, address.SECP256K1)
3737
require.NoError(t, err)
3838
}
3939

@@ -54,7 +54,7 @@ func TestWalletBalance(t *testing.T) {
5454
n, cmdClient, done := builder.BuildAndStartAPI(ctx)
5555
defer done()
5656

57-
addr, err := n.Wallet().API().WalletNewAddress(address.SECP256K1)
57+
addr, err := n.Wallet().API().WalletNewAddress(ctx, address.SECP256K1)
5858
require.NoError(t, err)
5959

6060
t.Log("[success] not found, zero")
@@ -107,7 +107,7 @@ func TestWalletExportImportRoundTrip(t *testing.T) {
107107
n, cmdClient, done := builder.BuildAndStartAPI(ctx)
108108
defer done()
109109

110-
addr, err := n.Wallet().API().WalletNewAddress(address.SECP256K1)
110+
addr, err := n.Wallet().API().WalletNewAddress(ctx, address.SECP256K1)
111111
require.NoError(t, err)
112112

113113
// ./venus wallet ls

‎go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ require (
9090
github.com/jstemmer/go-junit-report v0.9.1
9191
github.com/libp2p/go-eventbus v0.2.1
9292
github.com/libp2p/go-libp2p v0.17.0
93-
github.com/libp2p/go-libp2p-circuit v0.4.0
9493
github.com/libp2p/go-libp2p-core v0.13.0
9594
github.com/libp2p/go-libp2p-kad-dht v0.15.0
9695
github.com/libp2p/go-libp2p-mplex v0.4.1

‎pkg/chain/reorg_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ func TestReorgDiffSubset(t *testing.T) {
7272
// This function returns the forked head, the main head and the common ancestor.
7373
func getForkOldNewCommon(ctx context.Context, t *testing.T, builder *chain.Builder, a, b, c int) (*types.TipSet, *types.TipSet, *types.TipSet) {
7474
// Add "a" tipsets to the head of the chainStore.
75-
commonHead := builder.AppendManyOn(a, types.UndefTipSet)
75+
commonHead := builder.AppendManyOn(ctx, a, types.UndefTipSet)
7676
oldHead := commonHead
7777

7878
if c > 0 {
79-
oldHead = builder.AppendManyOn(c, commonHead)
79+
oldHead = builder.AppendManyOn(ctx, c, commonHead)
8080
}
81-
newHead := builder.AppendManyOn(b, commonHead)
81+
newHead := builder.AppendManyOn(ctx, b, commonHead)
8282
return oldHead, newHead, commonHead
8383
}
8484

@@ -88,9 +88,9 @@ func getForkOldNewCommon(ctx context.Context, t *testing.T, builder *chain.Build
8888
// consists of this single block and another block together forming a tipset
8989
// that is a superset of the forked head.
9090
func getSubsetOldNewCommon(ctx context.Context, t *testing.T, builder *chain.Builder, a int) (*types.TipSet, *types.TipSet, *types.TipSet) {
91-
commonHead := builder.AppendManyBlocksOnBlocks(a)
92-
block1 := builder.AppendBlockOnBlocks(commonHead)
93-
block2 := builder.AppendBlockOnBlocks(commonHead)
91+
commonHead := builder.AppendManyBlocksOnBlocks(ctx, a)
92+
block1 := builder.AppendBlockOnBlocks(ctx, commonHead)
93+
block2 := builder.AppendBlockOnBlocks(ctx, commonHead)
9494

9595
oldHead := testhelpers.RequireNewTipSet(t, block1)
9696
superset := testhelpers.RequireNewTipSet(t, block1, block2)

‎pkg/chain/store_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func newChainStore(r repo.Repo, genTS *types.TipSet) *CborBlockStore {
4747
// requirePutTestChain puts the count tipsets preceding head in the source to
4848
// the input chain store.
4949
func requirePutTestChain(ctx context.Context, t *testing.T, cborStore *CborBlockStore, head types.TipSetKey, source *chain.Builder, count int) {
50-
tss := source.RequireTipSets(head, count)
50+
tss := source.RequireTipSets(ctx, head, count)
5151
for _, ts := range tss {
5252
tsas := &chain.TipSetMetadata{
5353
TipSet: ts,

‎pkg/chain/traversal_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func TestFindCommonAncestorSameChain(t *testing.T) {
152152
builder := chain.NewBuilder(t, address.Undef)
153153
head := builder.Genesis()
154154
// Add 30 tipsets to the head of the chainStore.
155-
head = builder.AppendManyOn(ctx,30, head)
155+
head = builder.AppendManyOn(ctx, 30, head)
156156
headIterOne := chain.IterAncestors(ctx, builder, head)
157157
headIterTwo := chain.IterAncestors(ctx, builder, head)
158158
commonAncestor, err := chain.FindCommonAncestor(ctx, headIterOne, headIterTwo)

‎pkg/chainsync/syncer/syncer_integration_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ func TestLoadFork(t *testing.T) {
4646

4747
require.NoError(t, err)
4848

49-
base := builder.AppendManyOn(3, genesis)
50-
left := builder.AppendManyOn(4, base)
51-
right := builder.AppendManyOn(3, base)
49+
base := builder.AppendManyOn(ctx, 3, genesis)
50+
left := builder.AppendManyOn(ctx, 4, base)
51+
right := builder.AppendManyOn(ctx, 3, base)
5252

5353
leftTarget := &types.Target{
5454
Base: nil,

‎pkg/chainsync/syncer/syncer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ func TestSubsetParent(t *testing.T) {
404404
assert.NoError(t, s.HandleNewTipSet(ctx, target3))
405405

406406
// A full parent also works fine: {C1, C2} -> D1
407-
tipD1OnC1C2 := builder.AppendOn(tipC1C2, 1)
407+
tipD1OnC1C2 := builder.AppendOn(ctx, tipC1C2, 1)
408408
target4 := &syncTypes.Target{
409409
Base: nil,
410410
Current: nil,
@@ -557,7 +557,7 @@ func TestStoresMessageReceipts(t *testing.T) {
557557
}
558558
assert.NoError(t, syncer.HandleNewTipSet(ctx, target1))
559559

560-
receiptsCid, err := builder.Store().GetTipSetReceiptsRoot(t1)
560+
receiptsCid, err := builder.Store().GetTipSetReceiptsRoot(ctx, t1)
561561

562562
require.NoError(t, err)
563563

‎pkg/discovery/hello_protocol_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ func TestHelloHandshake(t *testing.T) {
5858
genesisA := builder.Genesis()
5959
store := builder.Store()
6060
mstore := builder.Mstore()
61-
heavy1 := builder.AppendOn(genesisA, 1)
62-
heavy2 := builder.AppendOn(heavy1, 1)
61+
heavy1 := builder.AppendOn(ctx, genesisA, 1)
62+
heavy2 := builder.AppendOn(ctx, heavy1, 1)
6363

6464
msc1, msc2 := new(mockHelloCallback), new(mockHelloCallback)
6565
hg1, hg2 := &mockHeaviestGetter{heavy1}, &mockHeaviestGetter{heavy2}
@@ -117,11 +117,11 @@ func TestHelloBadGenesis(t *testing.T) {
117117
store := builder.Store()
118118
mstore := builder.Mstore()
119119

120-
genesisA := builder.AppendOn(types.UndefTipSet, 1)
121-
genesisB := builder.AppendOn(types.UndefTipSet, 1)
120+
genesisA := builder.AppendOn(ctx, types.UndefTipSet, 1)
121+
genesisB := builder.AppendOn(ctx, types.UndefTipSet, 1)
122122

123-
heavy1 := builder.AppendOn(genesisA, 1)
124-
heavy2 := builder.AppendOn(heavy1, 1)
123+
heavy1 := builder.AppendOn(ctx, genesisA, 1)
124+
heavy2 := builder.AppendOn(ctx, heavy1, 1)
125125

126126
msc1, msc2 := new(mockHelloCallback), new(mockHelloCallback)
127127
hg1, hg2 := &mockHeaviestGetter{heavy1}, &mockHeaviestGetter{heavy2}
@@ -164,9 +164,9 @@ func TestHelloMultiBlock(t *testing.T) {
164164
genesisTipset := builder.Genesis()
165165
assert.Equal(t, 1, genesisTipset.Len())
166166

167-
heavy1 := builder.AppendOn(genesisTipset, 3)
168-
heavy1 = builder.AppendOn(heavy1, 3)
169-
heavy2 := builder.AppendOn(heavy1, 3)
167+
heavy1 := builder.AppendOn(ctx, genesisTipset, 3)
168+
heavy1 = builder.AppendOn(ctx, heavy1, 3)
169+
heavy2 := builder.AppendOn(ctx, heavy1, 3)
170170

171171
msc1, msc2 := new(mockHelloCallback), new(mockHelloCallback)
172172
hg1, hg2 := &mockHeaviestGetter{heavy1}, &mockHeaviestGetter{heavy2}

‎pkg/events/events_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (fcs *fakeCS) ChainGetPath(ctx context.Context, from, to types.TipSetKey) (
120120
}
121121

122122
// copied from the chainstore
123-
revert, apply, err := chain.ReorgOps(func(tsk types.TipSetKey) (*types.TipSet, error) {
123+
revert, apply, err := chain.ReorgOps(func(ctx context.Context, tsk types.TipSetKey) (*types.TipSet, error) {
124124
return fcs.ChainGetTipSet(ctx, tsk)
125125
}, fromTS, toTS)
126126
if err != nil {

‎pkg/market/fundmanager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (fm *FundManager) Start(ctx context.Context) error {
7979
// - in State() only load addresses with in-progress messages
8080
// - load the others just-in-time from getFundedAddress
8181
// - delete(fm.fundedAddrs, addr) when the queue has been processed
82-
return fm.str.forEach(func(state *FundedAddressState) {
82+
return fm.str.forEach(ctx, func(state *FundedAddressState) {
8383
fa := newFundedAddress(fm, state.Addr)
8484
fa.state = state
8585
fm.fundedAddrs[fa.state.Addr] = fa

‎pkg/market/fundmanager_test.go

+12-7
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,10 @@ func TestFundManagerReserveByWallet(t *testing.T) {
212212
s := setup(t)
213213
defer s.fm.Stop()
214214

215-
walletAddrA, err := s.wllt.NewAddress(address.SECP256K1)
215+
ctx := context.Background()
216+
walletAddrA, err := s.wllt.NewAddress(ctx, address.SECP256K1)
216217
require.NoError(t, err)
217-
walletAddrB, err := s.wllt.NewAddress(address.SECP256K1)
218+
walletAddrB, err := s.wllt.NewAddress(ctx, address.SECP256K1)
218219
require.NoError(t, err)
219220

220221
// Wait until all the reservation requests are queued up
@@ -400,9 +401,11 @@ func TestFundManagerWithdrawByWallet(t *testing.T) {
400401
tf.UnitTest(t)
401402
s := setup(t)
402403
defer s.fm.Stop()
403-
walletAddrA, err := s.wllt.NewAddress(address.SECP256K1)
404+
405+
ctx := context.Background()
406+
walletAddrA, err := s.wllt.NewAddress(ctx, address.SECP256K1)
404407
require.NoError(t, err)
405-
walletAddrB, err := s.wllt.NewAddress(address.SECP256K1)
408+
walletAddrB, err := s.wllt.NewAddress(ctx, address.SECP256K1)
406409
require.NoError(t, err)
407410

408411
// Reserve 10
@@ -510,6 +513,8 @@ func TestFundManagerRestart(t *testing.T) {
510513
s := setup(t)
511514
defer s.fm.Stop()
512515

516+
ctx := context.Background()
517+
513518
acctAddr2 := tutils.NewActorAddr(t, "addr2")
514519

515520
// Address 1: Reserve 10
@@ -537,7 +542,7 @@ func TestFundManagerRestart(t *testing.T) {
537542
// Restart
538543
mockAPIAfter := s.mockAPI
539544
fmAfter := newFundManager(mockAPIAfter, s.ds)
540-
err = fmAfter.Start()
545+
err = fmAfter.Start(ctx)
541546
require.NoError(t, err)
542547

543548
amt3 := abi.NewTokenAmount(9)
@@ -628,11 +633,11 @@ func setup(t *testing.T) *scaffold {
628633
ctx := context.Background()
629634
t.Log("create a backend")
630635
ds := datastore.NewMapDatastore()
631-
fs, err := wallet.NewDSBackend(ds, config.TestPassphraseConfig(), wallet.TestPassword)
636+
fs, err := wallet.NewDSBackend(ctx, ds, config.TestPassphraseConfig(), wallet.TestPassword)
632637
assert.NoError(t, err)
633638
t.Log("create a wallet with a single backend")
634639
wllt := wallet.New(fs)
635-
walletAddr, err := wllt.NewAddress(address.SECP256K1)
640+
walletAddr, err := wllt.NewAddress(ctx, address.SECP256K1)
636641
if err != nil {
637642
t.Fatal(err)
638643
}

‎pkg/market/store.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ func (ps *Store) save(ctx context.Context, state *FundedAddressState) error {
4242

4343
// get the state for the given address
4444
// nolint
45-
func (ps *Store) get(addr address.Address) (*FundedAddressState, error) {
45+
func (ps *Store) get(ctx context.Context, addr address.Address) (*FundedAddressState, error) {
4646
k := dskeyForAddr(addr)
4747

48-
data, err := ps.ds.Get(k)
48+
data, err := ps.ds.Get(ctx, k)
4949
if err != nil {
5050
return nil, err
5151
}
@@ -59,8 +59,8 @@ func (ps *Store) get(addr address.Address) (*FundedAddressState, error) {
5959
}
6060

6161
// forEach calls iter with each address in the datastore
62-
func (ps *Store) forEach(iter func(*FundedAddressState)) error {
63-
res, err := ps.ds.Query(dsq.Query{Prefix: dsKeyAddr})
62+
func (ps *Store) forEach(ctx context.Context, iter func(*FundedAddressState)) error {
63+
res, err := ps.ds.Query(ctx, dsq.Query{Prefix: dsKeyAddr})
6464
if err != nil {
6565
return err
6666
}

‎pkg/messagepool/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func saveConfig(ctx context.Context, cfg *MpoolConfig, ds repo.Datastore) error
6161
if err != nil {
6262
return err
6363
}
64-
return ds.Put(ctx, ConfigKey, cfgBytes)
64+
return ds.Put(ctx, ConfigKey, cfgBytes)
6565
}
6666

6767
func (mp *MessagePool) GetConfig() *MpoolConfig {

‎pkg/messagepool/messagesigner_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ func TestMessageSignerSignMessage(t *testing.T) {
5353

5454
ctx := context.Background()
5555
r := repo.NewInMemoryRepo()
56-
backend, err := wallet.NewDSBackend(r.WalletDatastore(), r.Config().Wallet.PassphraseConfig, wallet.TestPassword)
56+
backend, err := wallet.NewDSBackend(ctx, r.WalletDatastore(), r.Config().Wallet.PassphraseConfig, wallet.TestPassword)
5757
assert.NoError(t, err)
5858

5959
w := wallet.New(backend)
6060

61-
from1, err := w.NewAddress(address.SECP256K1)
61+
from1, err := w.NewAddress(ctx, address.SECP256K1)
6262
require.NoError(t, err)
63-
from2, err := w.NewAddress(address.SECP256K1)
63+
from2, err := w.NewAddress(ctx, address.SECP256K1)
6464
require.NoError(t, err)
65-
to1, err := w.NewAddress(address.SECP256K1)
65+
to1, err := w.NewAddress(ctx, address.SECP256K1)
6666
require.NoError(t, err)
67-
to2, err := w.NewAddress(address.SECP256K1)
67+
to2, err := w.NewAddress(ctx, address.SECP256K1)
6868
require.NoError(t, err)
6969

7070
type msgSpec struct {

‎pkg/messagepool/repub_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ func TestRepubMessages(t *testing.T) {
3232
}
3333

3434
// the actors
35+
ctx := context.Background()
3536
w1 := newWallet(t)
36-
a1, err := w1.NewAddress(address.SECP256K1)
37+
a1, err := w1.NewAddress(ctx, address.SECP256K1)
3738
if err != nil {
3839
t.Fatal(err)
3940
}
4041

4142
w2 := newWallet(t)
42-
a2, err := w2.NewAddress(address.SECP256K1)
43+
a2, err := w2.NewAddress(ctx, address.SECP256K1)
4344
if err != nil {
4445
t.Fatal(err)
4546
}

‎pkg/messagepool/selection_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ func TestPriorityMessageSelection2(t *testing.T) {
658658
}
659659

660660
w2 := newWallet(t)
661-
a2, err := w2.NewAddress(context.Background(),address.SECP256K1)
661+
a2, err := w2.NewAddress(context.Background(), address.SECP256K1)
662662
if err != nil {
663663
t.Fatal(err)
664664
}

‎pkg/metrics/heartbeat_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func newEndpoint(t *testing.T, port int) endpoint {
5656
libp2p.Identity(priv),
5757
}
5858

59-
basicHost, err := libp2p.New(context.Background(), opts...)
59+
basicHost, err := libp2p.New(opts...)
6060
if err != nil {
6161
t.Fatal(err)
6262
}

‎pkg/net/blocksub/validator_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func TestBlockTopicValidator(t *testing.T) {
2828
builder := chain.NewBuilder(t, address.Undef)
2929
pid1 := th.RequireIntPeerID(t, 1)
3030

31-
goodBlk := builder.BuildOnBlock(nil, func(b *chain.BlockBuilder) {})
32-
badBlk := builder.BuildOnBlock(nil, func(b *chain.BlockBuilder) {
31+
goodBlk := builder.BuildOnBlock(ctx, nil, func(b *chain.BlockBuilder) {})
32+
badBlk := builder.BuildOnBlock(ctx, nil, func(b *chain.BlockBuilder) {
3333
b.IncHeight(1)
3434
})
3535

0 commit comments

Comments
 (0)