fix: sync: do not include incoming in return of syncFork (#11541)

This commit is contained in:
Aayush Rajasekaran 2023-12-19 16:39:52 -05:00 committed by GitHub
parent 324748d01b
commit bfc26cdc18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -896,7 +896,7 @@ func (syncer *Syncer) syncFork(ctx context.Context, incoming *types.TipSet, know
if commonParent {
// 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)
if err != nil {
// fallback onto the network
@ -912,7 +912,7 @@ func (syncer *Syncer) syncFork(ctx context.Context, incoming *types.TipSet, know
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.