Merge pull request #8629 from filecoin-project/arajasek-patch-2

magik6k · web-flow · commit f0867a9615ad · 2022-05-10T20:19:28.000-04:00
fix: upgrades: correct error message for v16 migration
diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
@@ -1334,7 +1334,7 @@ func UpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.Mi
 
 	newRoot, err := upgradeActorsV8Common(ctx, sm, cache, root, epoch, ts, config)
 	if err != nil {
-		return cid.Undef, xerrors.Errorf("migrating actors v6 state: %w", err)
+		return cid.Undef, xerrors.Errorf("migrating actors v7 state: %w", err)
 	}
 
 	return newRoot, nil

Original file line number	Diff line number	Diff line change
`@@ -1334,7 +1334,7 @@ func UpgradeActorsV8(ctx context.Context, sm *stmgr.StateManager, cache stmgr.Mi`
`1334`	`1334`
`1335`	`1335`	`newRoot, err := upgradeActorsV8Common(ctx, sm, cache, root, epoch, ts, config)`
`1336`	`1336`	`if err != nil {`
`1337`		`- return cid.Undef, xerrors.Errorf("migrating actors v6 state: %w", err)`
	`1337`	`+ return cid.Undef, xerrors.Errorf("migrating actors v7 state: %w", err)`
`1338`	`1338`	`}`
`1339`	`1339`
`1340`	`1340`	`return newRoot, nil`