Skip to content

Commit

Permalink
Rename package nv9 to nv10 (filecoin-project#1358)
Browse files Browse the repository at this point in the history
  • Loading branch information
anorth authored and bibibong committed Feb 20, 2021
1 parent d0e0bc9 commit e3e73b5
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ build:

test:
$(GO_BIN) test ./...
$(GO_BIN) test -race ./actors/migration/nv9/test
$(GO_BIN) test -race ./actors/migration/nv10/test
.PHONY: test

test-migration:
$(GO_BIN) test -race ./actors/migration/nv9/test
$(GO_BIN) test -race ./actors/migration/nv10/test
.PHONY: test-migration

test-coverage:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
exported3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/exported"
market3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/market"
miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner"
"github.com/filecoin-project/specs-actors/v3/actors/migration/nv9"
"github.com/filecoin-project/specs-actors/v3/actors/migration/nv10"
states3 "github.com/filecoin-project/specs-actors/v3/actors/states"
tutil "github.com/filecoin-project/specs-actors/v3/support/testing"
vm3 "github.com/filecoin-project/specs-actors/v3/support/vm"
Expand Down Expand Up @@ -75,7 +75,7 @@ func TestUpdatePendingDealsMigration(t *testing.T) {
}
// run migration
nextRoot, err := nv9.MigrateStateTree(ctx, v.Store(), v.StateRoot(), v.GetEpoch(), nv9.Config{MaxWorkers: 1}, log, nv9.NewMemMigrationCache())
nextRoot, err := nv10.MigrateStateTree(ctx, v.Store(), v.StateRoot(), v.GetEpoch(), nv10.Config{MaxWorkers: 1}, log, nv10.NewMemMigrationCache())
require.NoError(t, err)
lookup := map[cid.Cid]rt.VMActor{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"
"github.com/filecoin-project/specs-actors/v3/actors/migration/nv9"
"github.com/filecoin-project/specs-actors/v3/actors/migration/nv10"
)
func TestParallelMigrationCalls(t *testing.T) {
Expand All @@ -28,20 +28,20 @@ func TestParallelMigrationCalls(t *testing.T) {
// Run migration
adtStore := adt2.WrapStore(ctx, cbor.NewCborStore(bs))
startRoot := vm.StateRoot()
endRootSerial, err := nv9.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv9.Config{MaxWorkers: 1}, log, nv9.NewMemMigrationCache())
endRootSerial, err := nv10.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv10.Config{MaxWorkers: 1}, log, nv10.NewMemMigrationCache())
require.NoError(t, err)
// Migrate in parallel
var endRootParallel1, endRootParallel2 cid.Cid
grp, ctx := errgroup.WithContext(ctx)
grp.Go(func() error {
var err1 error
endRootParallel1, err1 = nv9.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv9.Config{MaxWorkers: 2}, log, nv9.NewMemMigrationCache())
endRootParallel1, err1 = nv10.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv10.Config{MaxWorkers: 2}, log, nv10.NewMemMigrationCache())
return err1
})
grp.Go(func() error {
var err2 error
endRootParallel2, err2 = nv9.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv9.Config{MaxWorkers: 2}, log, nv9.NewMemMigrationCache())
endRootParallel2, err2 = nv10.MigrateStateTree(ctx, adtStore, startRoot, abi.ChainEpoch(0), nv10.Config{MaxWorkers: 2}, log, nv10.NewMemMigrationCache())
return err2
})
require.NoError(t, grp.Wait())
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nv9
package nv10

/*
import (
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/filecoin-project/go-amt-ipld/v3 v3.0.0-20201124192204-2b387ce1bab7
github.com/filecoin-project/go-bitfield v0.2.0
github.com/filecoin-project/go-hamt-ipld/v3 v3.0.0-20201203140949-5cdbb5191437
github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc
github.com/filecoin-project/go-state-types v0.0.0-20210119062722-4adba5aaea71
github.com/ipfs/go-block-format v0.0.2
github.com/ipfs/go-cid v0.0.7
github.com/ipfs/go-ipld-cbor v0.0.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03 h1:2pMX
github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03/go.mod h1:+viYnvGtUTgJRdy6oaeF4MTFKAfatX071MPDPBL11EQ=
github.com/filecoin-project/go-hamt-ipld/v3 v3.0.0-20201203140949-5cdbb5191437 h1:nu2XYXvzy6BNASKVpfCkmUFr6YDf43LMjkMMab+3Z1E=
github.com/filecoin-project/go-hamt-ipld/v3 v3.0.0-20201203140949-5cdbb5191437/go.mod h1:HBuSIxbIKqWjV0/bcJ/e14iIMr1FckG6cyzAsdfttyU=
github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc h1:+hbMY4Pcx2oizrfH08VWXwrj5mU8aJT6g0UNxGHFCGU=
github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
github.com/filecoin-project/go-state-types v0.0.0-20210119062722-4adba5aaea71 h1:Cas/CUB4ybYpdxvW7LouaydE16cpwdq3vvS3qgZuU+Q=
github.com/filecoin-project/go-state-types v0.0.0-20210119062722-4adba5aaea71/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
Expand Down

0 comments on commit e3e73b5

Please sign in to comment.