Whose short rule is important for completing the thirty-year count?

The Companions’ Disputes, Ijtihād, and the Rightly Guided Caliphate