diff --git a/ldevnet/ldevnet.go b/ldevnet/ldevnet.go index 403e9c8..98409f1 100644 --- a/ldevnet/ldevnet.go +++ b/ldevnet/ldevnet.go @@ -123,30 +123,40 @@ func New(numMiners int, blockDur time.Duration, bigSector bool, ipfsAddr string) for mine { time.Sleep(blockDur) if ctx.Err() != nil { + panic("context cancelled") mine = false continue } if err := sn[i].MineOne(context.Background(), func(bool, error) {}); err != nil { panic(err) } + i = (i + 1) % len(miners) - snums, err := sn[i].SectorsList(ctx) - if err != nil { - panic(err) - } + } + }() - for _, snum := range snums { - si, err := sn[i].SectorsStatus(ctx, snum) + go func() { + for { + for i := 0; i < numMiners; i++ { + snums, err := sn[i].SectorsList(ctx) if err != nil { panic(err) } - - if si.State == api.SectorState(sealing.WaitDeals) { - if err := sn[i].SectorStartSealing(ctx, snum); err != nil { + for _, snum := range snums { + si, err := sn[i].SectorsStatus(ctx, snum) + if err != nil { panic(err) } + + if si.State == api.SectorState(sealing.WaitDeals) { + if err := sn[i].SectorStartSealing(ctx, snum); err != nil { + panic(err) + + } + } } } + time.Sleep(time.Second) } }() @@ -356,9 +366,6 @@ func mockSbBuilder(nFull int, storage []test.StorageMiner, bigSector bool, ipfsA node.Override(new(ffiwrapper.Verifier), mock.MockVerifier), node.Unset(new(*sectorstorage.Manager)), )) - //if err := storers[i].StorageMiner.MarketSetPrice(ctx, types.NewInt(1000)); err != nil { - // return nil, nil, err - //} } if err := mn.LinkAll(); err != nil { @@ -398,11 +405,17 @@ func testStorageNode(ctx context.Context, waddr address.Address, act address.Add if err != nil { panic(err) } - nic := storedcounter.New(ds, datastore.NewKey("/storage/nextid")) + nic := storedcounter.New(ds, datastore.NewKey(modules.StorageCounterDSPrefix)) for i := 0; i < nGenesisPreseals; i++ { - nic.Next() + _, err := nic.Next() + if err != nil { + panic(err) + } + } + _, err = nic.Next() + if err != nil { + panic(err) } - nic.Next() err = lr.Close() if err != nil { @@ -423,7 +436,7 @@ func testStorageNode(ctx context.Context, waddr address.Address, act address.Add Params: enc, Value: types.NewInt(0), GasPrice: types.NewInt(0), - GasLimit: 1000000, + GasLimit: 0, } _, err = tnd.MpoolPushMessage(ctx, msg) diff --git a/ldevnet/ldevnet_test.go b/ldevnet/ldevnet_test.go index 1783fca..b86a649 100644 --- a/ldevnet/ldevnet_test.go +++ b/ldevnet/ldevnet_test.go @@ -22,6 +22,11 @@ import ( func TestMain(m *testing.M) { //logging.SetAllLoggers(logging.LevelDebug) + logging.SetLogLevel("miner", "ERROR") + logging.SetLogLevel("chainstore", "ERROR") + logging.SetLogLevel("chain", "ERROR") + logging.SetLogLevel("sub", "ERROR") + logging.SetLogLevel("storageminer", "ERROR") _ = logging.ErrNoSuchLogger os.Exit(m.Run()) } @@ -38,7 +43,7 @@ func TestStore(t *testing.T) { func dealSpecificMiner(t *testing.T, numMiners int, concreteMiner int) func(*testing.T) { return func(t *testing.T) { - _, err := New(numMiners, time.Millisecond*500, true, "") + _, err := New(numMiners, time.Millisecond*100, true, "") require.Nil(t, err) var client apistruct.FullNodeStruct @@ -71,7 +76,7 @@ func dealSpecificMiner(t *testing.T, numMiners int, concreteMiner int) func(*tes r := rand.New(rand.NewSource(22)) for i := 0; i < 2; i++ { - data := make([]byte, 1024*1024*50) + data := make([]byte, 50*1024*1024) r.Read(data) err = ioutil.WriteFile(tmpf.Name(), data, 0644) require.Nil(t, err)