Merge pull request #10086 from filecoin-project/gstuart/fix-testground-build
fix: testground build was broken
This commit is contained in:
commit
93b9f1a24f
@ -42,9 +42,6 @@ var (
|
|||||||
|
|
||||||
AllowableClockDriftSecs = uint64(1)
|
AllowableClockDriftSecs = uint64(1)
|
||||||
|
|
||||||
Finality = policy.ChainFinality
|
|
||||||
ForkLengthThreshold = Finality
|
|
||||||
|
|
||||||
SlashablePowerDelay = 20
|
SlashablePowerDelay = 20
|
||||||
InteractivePoRepConfidence = 6
|
InteractivePoRepConfidence = 6
|
||||||
|
|
||||||
@ -130,6 +127,9 @@ var (
|
|||||||
GenesisFile = ""
|
GenesisFile = ""
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const Finality = policy.ChainFinality
|
||||||
|
const ForkLengthThreshold = Finality
|
||||||
|
|
||||||
const BootstrapPeerThreshold = 1
|
const BootstrapPeerThreshold = 1
|
||||||
|
|
||||||
// ChainId defines the chain ID used in the Ethereum JSON-RPC endpoint.
|
// ChainId defines the chain ID used in the Ethereum JSON-RPC endpoint.
|
||||||
|
@ -22,7 +22,7 @@ import (
|
|||||||
"github.com/filecoin-project/lotus/chain/types"
|
"github.com/filecoin-project/lotus/chain/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
const TIPSETKEY_BACKFILL_RANGE = 2 * build.Finality
|
const TipsetkeyBackfillRange = 2 * build.Finality
|
||||||
|
|
||||||
func (cs *ChainStore) UnionStore() bstore.Blockstore {
|
func (cs *ChainStore) UnionStore() bstore.Blockstore {
|
||||||
return bstore.Union(cs.stateBlockstore, cs.chainBlockstore)
|
return bstore.Union(cs.stateBlockstore, cs.chainBlockstore)
|
||||||
@ -116,7 +116,7 @@ func (cs *ChainStore) Import(ctx context.Context, r io.Reader) (*types.TipSet, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
ts := root
|
ts := root
|
||||||
for i := 0; i < int(TIPSETKEY_BACKFILL_RANGE); i++ {
|
for i := 0; i < int(TipsetkeyBackfillRange); i++ {
|
||||||
err = cs.PersistTipset(ctx, ts)
|
err = cs.PersistTipset(ctx, ts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
Loading…
Reference in New Issue
Block a user