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

Merge branch 'master' into debugWeb for other bug fixes

Browse Source
This commit is contained in:
Andrew Jackson (Ajax) 2023-12-29 11:44:19 -06:00
commit 83295e3a25
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chain/sync.go
View File

@ -896,7 +896,7 @@ func (syncer *Syncer) syncFork(ctx context.Context, incoming *types.TipSet, know
if commonParent { if commonParent {
// known contains at least one of incoming's Parents => the common ancestor is known's Parents (incoming's Grandparents) // known contains at least one of incoming's Parents => the common ancestor is known's Parents (incoming's Grandparents)
// in this case, we need to return {incoming, incoming.Parents()} // in this case, we need to return {incoming.Parents()}
incomingParents, err := syncer.store.LoadTipSet(ctx, incomingParentsTsk) incomingParents, err := syncer.store.LoadTipSet(ctx, incomingParentsTsk)
if err != nil { if err != nil {
// fallback onto the network // fallback onto the network
@ -912,7 +912,7 @@ func (syncer *Syncer) syncFork(ctx context.Context, incoming *types.TipSet, know
incomingParents = tips[0] incomingParents = tips[0]
} }
return []*types.TipSet{incoming, incomingParents}, nil return []*types.TipSet{incomingParents}, nil
} }
// TODO: Does this mean we always ask for ForkLengthThreshold blocks from the network, even if we just need, like, 2? Yes. // TODO: Does this mean we always ask for ForkLengthThreshold blocks from the network, even if we just need, like, 2? Yes.

2
cmd/lotus-miner/sectors.go
View File

@ -2290,7 +2290,7 @@ var sectorsCompactPartitionsCmd = &cli.Command{
if len(parts) <= 0 { if len(parts) <= 0 {
return fmt.Errorf("must include at least one partition to compact") return fmt.Errorf("must include at least one partition to compact")
} }
fmt.Printf("compacting %d paritions\n", len(parts)) fmt.Printf("compacting %d partitions\n", len(parts))
var makeMsgForPartitions func(partitionsBf bitfield.BitField) ([]*types.Message, error) var makeMsgForPartitions func(partitionsBf bitfield.BitField) ([]*types.Message, error)
makeMsgForPartitions = func(partitionsBf bitfield.BitField) ([]*types.Message, error) { makeMsgForPartitions = func(partitionsBf bitfield.BitField) ([]*types.Message, error) {

2
cmd/lotus-shed/miner.go
View File

@ -553,7 +553,7 @@ var sendInvalidWindowPoStCmd = &cli.Command{
return xerrors.Errorf("serializing params: %w", err) return xerrors.Errorf("serializing params: %w", err)
} }
fmt.Printf("submitting bad PoST for %d paritions\n", len(partitionIndices)) fmt.Printf("submitting bad PoST for %d partitions\n", len(partitionIndices))
smsg, err := api.MpoolPushMessage(ctx, &types.Message{ smsg, err := api.MpoolPushMessage(ctx, &types.Message{
From: minfo.Worker, From: minfo.Worker,
To: maddr, To: maddr,