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

Fix merge

Browse Source
This commit is contained in:
Darko Brdareski 2022-01-27 11:06:04 +01:00
parent e51ce5c508
commit 6b8f526df3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
itests/ccupgrade_test.go
View File

@ -72,12 +72,8 @@ func runTestCCUpgrade(t *testing.T, upgradeHeight abi.ChainEpoch) *kit.TestFullN
} }
waitForSectorActive(ctx, t, CCUpgrade, client, maddr) waitForSectorActive(ctx, t, CCUpgrade, client, maddr)
<<<<<<< HEAD
//stm: @SECTOR_CC_UPGRADE_001 //stm: @SECTOR_CC_UPGRADE_001
err = miner.SectorMarkForUpgrade(ctx, sl[0])
=======
err = miner.SectorMarkForUpgrade(ctx, sl[0], true) err = miner.SectorMarkForUpgrade(ctx, sl[0], true)
>>>>>>> upstream/master
require.NoError(t, err) require.NoError(t, err)
sl, err = miner.SectorsList(ctx) sl, err = miner.SectorsList(ctx)