fix: cherrypick/conflict wrongfully resolved

[jennijuju]

seems like the right code should be

lotus/node/impl/full/eth.go

Lines 251 to 268 in 58900a7

	default:
	var num ethtypes.EthUint64
	err := num.UnmarshalJSON([]byte(`"` + blkParam + `"`))
	if err != nil {
	return nil, fmt.Errorf("cannot parse block number: %v", err)
	}
	if abi.ChainEpoch(num) > head.Height()-1 {
	return nil, fmt.Errorf("requested a future epoch (beyond 'latest')")
	}
	ts, err := a.ChainAPI.ChainGetTipSetByHeight(ctx, abi.ChainEpoch(num), head.Key())
	if err != nil {
	return nil, fmt.Errorf("cannot get tipset at height: %v", num)
	}
	if strict && ts.Height() != abi.ChainEpoch(num) {
	return nil, ErrNullRound
	}
	return ts, nil
	}

but

lotus/node/impl/full/eth.go

Lines 251 to 265 in 99749e9

	default:
	var num ethtypes.EthUint64
	err := num.UnmarshalJSON([]byte(`"` + blkParam + `"`))
	if err != nil {
	return nil, fmt.Errorf("cannot parse block number: %v", err)
	}
	ts, err := a.Chain.GetTipsetByHeight(ctx, abi.ChainEpoch(num), nil, true)
	if err != nil {
	return nil, fmt.Errorf("cannot get tipset at height: %v", num)
	}
	if strict && ts.Height() != abi.ChainEpoch(num) {
	return nil, ErrNullRound
	}
	return ts, nil
	}

was outdated

[Stebalien]

Would explain the failing test.

[Stebalien]

Looks like something is still wrong with the go.mod file.

[jennijuju]

Would explain the failing test.

I thought was flakey..... my bad...

[Stebalien]

I thought was flakey..... my bad...

So did I.