cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

move init to main, add more logging

Browse Source
This commit is contained in:
Anton Evangelatov 2020-06-24 16:46:12 +02:00
parent f460d24f65
commit bb758854fb
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lotus-soup/baseline.go
View File

@ -82,15 +82,15 @@ func runBaselineMiner(t *TestEnvironment) error {
go func() {
defer close(done)
for mine {
time.Sleep(10 * time.Millisecond)
//t.RecordMessage("mine one block")
time.Sleep(10 * time.Second)
t.RecordMessage("mine one block")
if err := miner.MineOne(ctx, func(bool) {}); err != nil {
panic(err)
}
}
}()
time.Sleep(300 * time.Second)
time.Sleep(3600 * time.Second)
mine = false
fmt.Println("shutting down mining")
<-done
@ -122,6 +122,8 @@ func runBaselineClient(t *TestEnvironment) error {
t.RecordMessage("client connected to miner")
time.Sleep(10 * time.Second)
// generate random data
data := make([]byte, 1600)
rand.New(rand.NewSource(time.Now().UnixNano())).Read(data)
@ -137,7 +139,7 @@ func runBaselineClient(t *TestEnvironment) error {
t.RecordMessage("started deal: %s", deal)
// TODO: this sleep is only necessary because deals don't immediately get logged in the dealstore, we should fix this
time.Sleep(3 * time.Second)
time.Sleep(5 * time.Second)
t.RecordMessage("wait to be sealed")
waitDealSealed(ctx, client, deal)

26
lotus-soup/main.go
View File

@ -3,14 +3,40 @@ package main
import (
"fmt"
"github.com/filecoin-project/lotus/build"
"github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin/power"
"github.com/filecoin-project/specs-actors/actors/builtin/verifreg"
"github.com/testground/sdk-go/run"
"github.com/testground/sdk-go/runtime"
saminer "github.com/filecoin-project/specs-actors/actors/builtin/miner"
logging "github.com/ipfs/go-log/v2"
)
var testplans = map[string]interface{}{
"lotus-baseline": doRun(baselineRoles),
}
func init() {
logging.SetLogLevel("vm", "WARN")
logging.SetLogLevel("miner", "WARN")
logging.SetLogLevel("chainstore", "WARN")
logging.SetLogLevel("chain", "WARN")
logging.SetLogLevel("sub", "WARN")
logging.SetLogLevel("storageminer", "WARN")
build.DisableBuiltinAssets = true
// Note: I don't understand the significance of this, but the node test does it.
power.ConsensusMinerMinPower = big.NewInt(2048)
saminer.SupportedProofTypes = map[abi.RegisteredSealProof]struct{}{
abi.RegisteredSealProof_StackedDrg2KiBV1: {},
}
verifreg.MinVerifiedDealSize = big.NewInt(256)
}
func main() {
run.InvokeMap(testplans)
}

16
lotus-soup/node.go
View File

@ -14,7 +14,6 @@ import (
"github.com/testground/sdk-go/runtime"
"github.com/testground/sdk-go/sync"
logging "github.com/ipfs/go-log/v2"
libp2p_crypto "github.com/libp2p/go-libp2p-core/crypto"
"github.com/libp2p/go-libp2p-core/peer"
ma "github.com/multiformats/go-multiaddr"
@ -40,13 +39,11 @@ import (
"github.com/filecoin-project/lotus/node/modules/lp2p"
modtest "github.com/filecoin-project/lotus/node/modules/testing"
"github.com/filecoin-project/lotus/node/repo"
"github.com/filecoin-project/specs-actors/actors/builtin/verifreg"
"github.com/filecoin-project/specs-actors/actors/abi"
"github.com/filecoin-project/specs-actors/actors/abi/big"
"github.com/filecoin-project/specs-actors/actors/builtin"
saminer "github.com/filecoin-project/specs-actors/actors/builtin/miner"
"github.com/filecoin-project/specs-actors/actors/builtin/power"
"github.com/filecoin-project/specs-actors/actors/crypto"
)
@ -95,19 +92,6 @@ type MinerAddresses struct {
ActorAddr address.Address
}
func init() {
logging.SetLogLevel("vm", "WARN")
build.DisableBuiltinAssets = true
// Note: I don't understand the significance of this, but the node test does it.
power.ConsensusMinerMinPower = big.NewInt(2048)
saminer.SupportedProofTypes = map[abi.RegisteredSealProof]struct{}{
abi.RegisteredSealProof_StackedDrg2KiBV1: {},
}
verifreg.MinVerifiedDealSize = big.NewInt(256)
}
func prepareBootstrapper(t *TestEnvironment) (*Node, error) {
ctx, cancel := context.WithTimeout(context.Background(), PrepareNodeTimeout)
defer cancel()