Merge pull request #6486 from filecoin-project/refactor/itest-batch-deal
refactor batch deal test to use kit2
This commit is contained in:
commit
f0a8a85928
@ -10,16 +10,15 @@ import (
|
|||||||
"github.com/filecoin-project/go-state-types/abi"
|
"github.com/filecoin-project/go-state-types/abi"
|
||||||
"github.com/filecoin-project/go-state-types/big"
|
"github.com/filecoin-project/go-state-types/big"
|
||||||
"github.com/filecoin-project/lotus/extern/storage-sealing/sealiface"
|
"github.com/filecoin-project/lotus/extern/storage-sealing/sealiface"
|
||||||
"github.com/filecoin-project/lotus/itests/kit"
|
"github.com/filecoin-project/lotus/itests/kit2"
|
||||||
"github.com/filecoin-project/lotus/markets/storageadapter"
|
"github.com/filecoin-project/lotus/markets/storageadapter"
|
||||||
"github.com/filecoin-project/lotus/node"
|
"github.com/filecoin-project/lotus/node"
|
||||||
"github.com/filecoin-project/lotus/node/impl"
|
|
||||||
"github.com/filecoin-project/lotus/node/modules/dtypes"
|
"github.com/filecoin-project/lotus/node/modules/dtypes"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestBatchDealInput(t *testing.T) {
|
func TestBatchDealInput(t *testing.T) {
|
||||||
kit.QuietMiningLogs()
|
kit2.QuietMiningLogs()
|
||||||
|
|
||||||
var (
|
var (
|
||||||
blockTime = 10 * time.Millisecond
|
blockTime = 10 * time.Millisecond
|
||||||
@ -32,13 +31,13 @@ func TestBatchDealInput(t *testing.T) {
|
|||||||
|
|
||||||
run := func(piece, deals, expectSectors int) func(t *testing.T) {
|
run := func(piece, deals, expectSectors int) func(t *testing.T) {
|
||||||
return func(t *testing.T) {
|
return func(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
publishPeriod := 10 * time.Second
|
publishPeriod := 10 * time.Second
|
||||||
maxDealsPerMsg := uint64(deals)
|
maxDealsPerMsg := uint64(deals)
|
||||||
|
|
||||||
// Set max deals per publish deals message to maxDealsPerMsg
|
// Set max deals per publish deals message to maxDealsPerMsg
|
||||||
minerDef := []kit.StorageMiner{{
|
opts := kit2.ConstructorOpts(node.Options(
|
||||||
Full: 0,
|
|
||||||
Opts: node.Options(
|
|
||||||
node.Override(
|
node.Override(
|
||||||
new(*storageadapter.DealPublisher),
|
new(*storageadapter.DealPublisher),
|
||||||
storageadapter.NewDealPublisher(nil, storageadapter.PublishMsgConfig{
|
storageadapter.NewDealPublisher(nil, storageadapter.PublishMsgConfig{
|
||||||
@ -56,26 +55,16 @@ func TestBatchDealInput(t *testing.T) {
|
|||||||
}, nil
|
}, nil
|
||||||
}, nil
|
}, nil
|
||||||
}),
|
}),
|
||||||
),
|
))
|
||||||
Preseal: kit.PresealGenesis,
|
client, miner, ens := kit2.EnsembleMinimal(t, kit2.MockProofs(), opts)
|
||||||
}}
|
ens.InterconnectAll().BeginMining(blockTime)
|
||||||
|
dh := kit2.NewDealHarness(t, client, miner)
|
||||||
// Create a connect client and miner node
|
|
||||||
n, sn := kit.MockMinerBuilder(t, kit.OneFull, minerDef)
|
|
||||||
client := n[0].FullNode.(*impl.FullNodeAPI)
|
|
||||||
miner := sn[0]
|
|
||||||
|
|
||||||
blockMiner := kit.ConnectAndStartMining(t, blockTime, miner, client)
|
|
||||||
t.Cleanup(blockMiner.Stop)
|
|
||||||
|
|
||||||
dh := kit.NewDealHarness(t, client, miner)
|
|
||||||
ctx := context.Background()
|
|
||||||
|
|
||||||
err := miner.MarketSetAsk(ctx, big.Zero(), big.Zero(), 200, 128, 32<<30)
|
err := miner.MarketSetAsk(ctx, big.Zero(), big.Zero(), 200, 128, 32<<30)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
checkNoPadding := func() {
|
checkNoPadding := func() {
|
||||||
sl, err := sn[0].SectorsList(ctx)
|
sl, err := miner.SectorsList(ctx)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
sort.Slice(sl, func(i, j int) bool {
|
sort.Slice(sl, func(i, j int) bool {
|
||||||
@ -83,7 +72,7 @@ func TestBatchDealInput(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
for _, snum := range sl {
|
for _, snum := range sl {
|
||||||
si, err := sn[0].SectorsStatus(ctx, snum, false)
|
si, err := miner.SectorsStatus(ctx, snum, false)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// fmt.Printf("S %d: %+v %s\n", snum, si.Deals, si.State)
|
// fmt.Printf("S %d: %+v %s\n", snum, si.Deals, si.State)
|
||||||
@ -98,7 +87,7 @@ func TestBatchDealInput(t *testing.T) {
|
|||||||
|
|
||||||
// Starts a deal and waits until it's published
|
// Starts a deal and waits until it's published
|
||||||
runDealTillSeal := func(rseed int) {
|
runDealTillSeal := func(rseed int) {
|
||||||
res, _, _, err := kit.CreateImportFile(ctx, client, rseed, piece)
|
res, _, _, err := kit2.CreateImportFile(ctx, client, rseed, piece)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
deal := dh.StartDeal(ctx, res.Root, false, dealStartEpoch)
|
deal := dh.StartDeal(ctx, res.Root, false, dealStartEpoch)
|
||||||
@ -122,7 +111,7 @@ func TestBatchDealInput(t *testing.T) {
|
|||||||
|
|
||||||
checkNoPadding()
|
checkNoPadding()
|
||||||
|
|
||||||
sl, err := sn[0].SectorsList(ctx)
|
sl, err := miner.SectorsList(ctx)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, len(sl), expectSectors)
|
require.Equal(t, len(sl), expectSectors)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user