address review

filecoin-project · Oct 20, 2022 · 7609655 · 7609655
1 parent dc8206e
commit 7609655
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 37 deletions.
diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
@@ -199,7 +199,7 @@ func DefaultUpgradeSchedule() stmgr.UpgradeSchedule {
 			PreMigration:    PreUpgradeActorsV9,
 			StartWithin:     240,
 			DontStartWithin: 60,
-			StopWithin:      5,
+			StopWithin:      20,
 		}, {
 			PreMigration:    PreUpgradeActorsV9,
 			StartWithin:     15,

diff --git a/cmd/lotus-shed/diff.go b/cmd/lotus-shed/diff.go
@@ -91,28 +91,6 @@ var diffMinerStates = &cli.Command{
 			return err
 		}
 
-		//minerCode, err := cid.Decode("bafk2bzacedxmikgiz7du7e36vzsbmmhhozdtsucjkdo4uzkhj7nacajm33rx4")
-		//if err != nil {
-		//	return err
-		//}
-		//
-		//minerStIntA, err := miner.Load(actorStore, &types.Actor{Head: stCidA, Code: minerCode})
-		//if err != nil {
-		//	return err
-		//}
-		//
-		//minerStIntB, err := miner.Load(actorStore, &types.Actor{Head: stCidB, Code: minerCode})
-		//if err != nil {
-		//	return err
-		//}
-		//
-		//dlDiff, err := miner.DiffDeadlines(minerStIntA, minerStIntB)
-		//if err != nil {
-		//	return err
-		//}
-		//
-		//fmt.Println(dlDiff)
-
 		fmt.Println(minerStA.Deadlines)
 		fmt.Println(minerStB.Deadlines)
 
@@ -167,18 +145,6 @@ var diffMinerStates = &cli.Command{
 							fmt.Println(i, "isn't found in infoB!!")
 						}
 
-						if infoA.SimpleQAPower != infoB.SimpleQAPower {
-							fmt.Println("gfreak1")
-						}
-
-						if infoA.SectorKeyCID != infoB.SectorKeyCID {
-							fmt.Println("gfreak2")
-						}
-
-						if infoA.SealedCID != infoB.SealedCID {
-							fmt.Println("gfreak3")
-						}
-
 						if !infoA.DealWeight.Equals(infoB.DealWeight) {
 							fmt.Println("Deal Weights differ! ", infoA.DealWeight, infoB.DealWeight)
 						}

diff --git a/cmd/lotus-shed/migrations.go b/cmd/lotus-shed/migrations.go
@@ -176,7 +176,7 @@ var migrationsCmd = &cli.Command{
 		fmt.Println("completed round actual (without cache), took ", uncachedMigrationTime)
 
 		if cctx.Bool("check-invariants") {
-			err = checkStateInvariants(ctx, blk.ParentStateRoot, newCid1, bs, blk.Height-1)
+			err = checkMigrationInvariants(ctx, blk.ParentStateRoot, newCid1, bs, blk.Height-1)
 			if err != nil {
 				return err
 			}
@@ -186,7 +186,7 @@ var migrationsCmd = &cli.Command{
 	},
 }
 
-func checkStateInvariants(ctx context.Context, v8StateRoot cid.Cid, v9StateRoot cid.Cid, bs blockstore.Blockstore, epoch abi.ChainEpoch) error {
+func checkMigrationInvariants(ctx context.Context, v8StateRoot cid.Cid, v9StateRoot cid.Cid, bs blockstore.Blockstore, epoch abi.ChainEpoch) error {
 	actorStore := store.ActorStore(ctx, bs)
 	startTime := time.Now()