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

Appease the linter and get everything building

Browse Source
This commit is contained in:
Aayush Rajasekaran 2020-09-18 02:14:18 -04:00
parent 37de154a7c
commit fce423c743
8 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/params_testground.go
View File

@ -81,4 +81,5 @@ var (
} }
NewestNetworkVersion = network.Version2 NewestNetworkVersion = network.Version2
ActorUpgradeNetworkVersion = network.Version3
) )

1
extern/storage-sealing/checks.go vendored
View File

@ -105,6 +105,7 @@ func checkPrecommit(ctx context.Context, maddr address.Address, si SectorInfo, t
msd = v0miner.MaxSealDuration[si.SectorType] msd = v0miner.MaxSealDuration[si.SectorType]
} else { } else {
// TODO: ActorUpgrade // TODO: ActorUpgrade
msd = 0
} }
if height-(si.TicketEpoch+SealRandomnessLookback) > msd { if height-(si.TicketEpoch+SealRandomnessLookback) > msd {

1
extern/storage-sealing/precommit_policy.go vendored
View File

@ -90,6 +90,7 @@ func (p *BasicPreCommitPolicy) Expiration(ctx context.Context, ps ...Piece) (abi
wpp = v0miner.WPoStProvingPeriod wpp = v0miner.WPoStProvingPeriod
} else { } else {
// TODO: ActorUpgrade // TODO: ActorUpgrade
wpp = 0
} }
*end += wpp - (*end % wpp) + p.provingBoundary - 1 *end += wpp - (*end % wpp) + p.provingBoundary - 1

3
extern/storage-sealing/precommit_policy_test.go vendored
View File

@ -2,9 +2,10 @@ package sealing_test
import ( import (
"context" "context"
"testing"
"github.com/filecoin-project/go-state-types/network" "github.com/filecoin-project/go-state-types/network"
"github.com/filecoin-project/lotus/build" "github.com/filecoin-project/lotus/build"
"testing"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

5
extern/storage-sealing/sealing.go vendored
View File

@ -431,9 +431,8 @@ func (m *Sealing) getPreCommitChallengeDelay(ctx context.Context, tok TipSetToke
if nv < build.ActorUpgradeNetworkVersion { if nv < build.ActorUpgradeNetworkVersion {
return v0miner.PreCommitChallengeDelay, nil return v0miner.PreCommitChallengeDelay, nil
} else {
// TODO: ActorUpgrade
return -1, nil
} }
// TODO: ActorUpgrade
return -1, nil
} }

3
extern/storage-sealing/states_sealing.go vendored
View File

@ -195,6 +195,8 @@ func (m *Sealing) handlePreCommitting(ctx statemachine.Context, sector SectorInf
mse = v0miner.MinSectorExpiration mse = v0miner.MinSectorExpiration
} else { } else {
// TODO: ActorUpgrade // TODO: ActorUpgrade
msd = 0
mse = 0
} }
if minExpiration := height + msd + mse + 10; expiration < minExpiration { if minExpiration := height + msd + mse + 10; expiration < minExpiration {
@ -395,6 +397,7 @@ func (m *Sealing) handleSubmitCommit(ctx statemachine.Context, sector SectorInfo
} }
} else { } else {
// TODO: ActorUpgrade // TODO: ActorUpgrade
enc = nil
} }
waddr, err := m.api.StateMinerWorkerAddress(ctx.Context(), m.maddr, tok) waddr, err := m.api.StateMinerWorkerAddress(ctx.Context(), m.maddr, tok)

4
go.sum
View File

@ -226,10 +226,6 @@ github.com/filecoin-project/go-data-transfer v0.6.3 h1:7TLwm8nuodHYD/uiwJjKc/PGR
github.com/filecoin-project/go-data-transfer v0.6.3/go.mod h1:PmBKVXkhh67/tnEdJXQwDHl5mT+7Tbcwe1NPninqhnM= github.com/filecoin-project/go-data-transfer v0.6.3/go.mod h1:PmBKVXkhh67/tnEdJXQwDHl5mT+7Tbcwe1NPninqhnM=
github.com/filecoin-project/go-fil-commcid v0.0.0-20200716160307-8f644712406f h1:GxJzR3oRIMTPtpZ0b7QF8FKPK6/iPAc7trhlL5k/g+s= github.com/filecoin-project/go-fil-commcid v0.0.0-20200716160307-8f644712406f h1:GxJzR3oRIMTPtpZ0b7QF8FKPK6/iPAc7trhlL5k/g+s=
github.com/filecoin-project/go-fil-commcid v0.0.0-20200716160307-8f644712406f/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ= github.com/filecoin-project/go-fil-commcid v0.0.0-20200716160307-8f644712406f/go.mod h1:Eaox7Hvus1JgPrL5+M3+h7aSPHc0cVqpSxA+TxIEpZQ=
github.com/filecoin-project/go-fil-markets v0.6.1-0.20200911011457-2959ccca6a3c h1:YGoyYmELQ0LHwDj/WcOvY3oYt+3iM0wdrAhqJQUAIy4=
github.com/filecoin-project/go-fil-markets v0.6.1-0.20200911011457-2959ccca6a3c/go.mod h1:PLr9svZxsnHkae1Ky7+66g7fP9AlneVxIVu+oSMq56A=
github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917050751-2af52e9606c6 h1:k97Z2JP3WpDVGU/7Bz3RtnqrYtn9X428Ps8OkoFq61I=
github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917050751-2af52e9606c6/go.mod h1:PLr9svZxsnHkae1Ky7+66g7fP9AlneVxIVu+oSMq56A=
github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917052354-ee0af754c6e9 h1:SnCUC9wHDId9TtV8PsQp8q1OOsi+NOLOwitIDnAgUa4= github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917052354-ee0af754c6e9 h1:SnCUC9wHDId9TtV8PsQp8q1OOsi+NOLOwitIDnAgUa4=
github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917052354-ee0af754c6e9/go.mod h1:PLr9svZxsnHkae1Ky7+66g7fP9AlneVxIVu+oSMq56A= github.com/filecoin-project/go-fil-markets v0.6.1-0.20200917052354-ee0af754c6e9/go.mod h1:PLr9svZxsnHkae1Ky7+66g7fP9AlneVxIVu+oSMq56A=
github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3LPEk0OrS/ytIBM= github.com/filecoin-project/go-hamt-ipld v0.1.5 h1:uoXrKbCQZ49OHpsTCkrThPNelC4W3LPEk0OrS/ytIBM=

3
node/impl/full/state.go
View File

@ -3,7 +3,6 @@ package full
import ( import (
"bytes" "bytes"
"context" "context"
"errors"
"strconv" "strconv"
v0market "github.com/filecoin-project/specs-actors/actors/builtin/market" v0market "github.com/filecoin-project/specs-actors/actors/builtin/market"
@ -47,8 +46,6 @@ import (
"github.com/filecoin-project/lotus/node/modules/dtypes" "github.com/filecoin-project/lotus/node/modules/dtypes"
) )
var errBreakForeach = errors.New("break")
type StateAPI struct { type StateAPI struct {
fx.In fx.In