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

fix forks_test

Browse Source
This commit is contained in:
vyzo 2022-04-08 14:00:25 +03:00
parent 73e7c42b7e
commit 12554baed4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chain/stmgr/forks_test.go
View File

@ -130,7 +130,7 @@ func TestForkHeightTriggers(t *testing.T) {
Network: network.Version1, Network: network.Version1,
Height: testForkHeight, Height: testForkHeight,
Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor, Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor,
root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { mf cid.Cid, root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
cst := ipldcbor.NewCborStore(sm.ChainStore().StateBlockstore()) cst := ipldcbor.NewCborStore(sm.ChainStore().StateBlockstore())
st, err := sm.StateTree(root) st, err := sm.StateTree(root)
@ -168,7 +168,7 @@ func TestForkHeightTriggers(t *testing.T) {
} }
inv := filcns.NewActorRegistry() inv := filcns.NewActorRegistry()
inv.Register(nil, testActor{}) inv.Register(actors.Version0, nil, testActor{})
sm.SetVMConstructor(func(ctx context.Context, vmopt *vm.VMOpts) (vm.Interface, error) { sm.SetVMConstructor(func(ctx context.Context, vmopt *vm.VMOpts) (vm.Interface, error) {
nvm, err := vm.NewLegacyVM(ctx, vmopt) nvm, err := vm.NewLegacyVM(ctx, vmopt)
@ -276,7 +276,7 @@ func testForkRefuseCall(t *testing.T, nullsBefore, nullsAfter int) {
Expensive: true, Expensive: true,
Height: testForkHeight, Height: testForkHeight,
Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor, Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor,
root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { mf cid.Cid, root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
migrationCount++ migrationCount++
return root, nil return root, nil
}}}, cg.BeaconSchedule()) }}}, cg.BeaconSchedule())
@ -285,7 +285,7 @@ func testForkRefuseCall(t *testing.T, nullsBefore, nullsAfter int) {
} }
inv := filcns.NewActorRegistry() inv := filcns.NewActorRegistry()
inv.Register(nil, testActor{}) inv.Register(actors.Version0, nil, testActor{})
sm.SetVMConstructor(func(ctx context.Context, vmopt *vm.VMOpts) (vm.Interface, error) { sm.SetVMConstructor(func(ctx context.Context, vmopt *vm.VMOpts) (vm.Interface, error) {
nvm, err := vm.NewLegacyVM(ctx, vmopt) nvm, err := vm.NewLegacyVM(ctx, vmopt)
@ -412,7 +412,7 @@ func TestForkPreMigration(t *testing.T) {
Network: network.Version1, Network: network.Version1,
Height: testForkHeight, Height: testForkHeight,
Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor, Migration: func(ctx context.Context, sm *StateManager, cache MigrationCache, cb ExecMonitor,
root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) { mf cid.Cid, root cid.Cid, height abi.ChainEpoch, ts *types.TipSet) (cid.Cid, error) {
// Make sure the test that should be canceled, is canceled. // Make sure the test that should be canceled, is canceled.
select { select {
@ -431,7 +431,7 @@ func TestForkPreMigration(t *testing.T) {
PreMigrations: []PreMigration{{ PreMigrations: []PreMigration{{
StartWithin: 20, StartWithin: 20,
PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache, PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache,
_ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error { _ cid.Cid, _ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error {
wait20.Done() wait20.Done()
wait20.Wait() wait20.Wait()
@ -445,7 +445,7 @@ func TestForkPreMigration(t *testing.T) {
}, { }, {
StartWithin: 20, StartWithin: 20,
PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache, PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache,
_ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error { _ cid.Cid, _ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error {
wait20.Done() wait20.Done()
wait20.Wait() wait20.Wait()
@ -459,7 +459,7 @@ func TestForkPreMigration(t *testing.T) {
}, { }, {
StartWithin: 20, StartWithin: 20,
PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache, PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache,
_ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error { _ cid.Cid, _ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error {
wait20.Done() wait20.Done()
wait20.Wait() wait20.Wait()
@ -475,7 +475,7 @@ func TestForkPreMigration(t *testing.T) {
StartWithin: 15, StartWithin: 15,
StopWithin: 5, StopWithin: 5,
PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache, PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache,
_ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error { _ cid.Cid, _ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error {
<-ctx.Done() <-ctx.Done()
close(wasCanceled) close(wasCanceled)
@ -487,7 +487,7 @@ func TestForkPreMigration(t *testing.T) {
}, { }, {
StartWithin: 10, StartWithin: 10,
PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache, PreMigration: func(ctx context.Context, _ *StateManager, cache MigrationCache,
_ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error { _ cid.Cid, _ cid.Cid, _ abi.ChainEpoch, _ *types.TipSet) error {
checkCache(t, cache) checkCache(t, cache)
@ -506,7 +506,7 @@ func TestForkPreMigration(t *testing.T) {
}() }()
inv := filcns.NewActorRegistry() inv := filcns.NewActorRegistry()
inv.Register(nil, testActor{}) inv.Register(actors.Version0, nil, testActor{})
sm.SetVMConstructor(func(ctx context.Context, vmopt *vm.VMOpts) (vm.Interface, error) { sm.SetVMConstructor(func(ctx context.Context, vmopt *vm.VMOpts) (vm.Interface, error) {
nvm, err := vm.NewLegacyVM(ctx, vmopt) nvm, err := vm.NewLegacyVM(ctx, vmopt)