In any case, enough splitting hairs. What Calvin says about faith and hope here is an instance of his linguistic genius which rightly earned him a renowned place in the history of Protestant theology. As always, bold is mine:
If faith (as we have said) is a sure persuasion of the truth of God, a persuasion that cannot lie to us, deceive us, or vex us, then those who have grasped this assurance expect that it will straightway come to pass that God will fulfill his promises, since according to their opinion they cannot but be true. To sum up, hope is nothing else than the expectation of those things that faith believed to have been truly promised by God.
Thus faith believes God to be truthful; hope waits for him to show us truth at the right occasion. Faith believes God to be our Father; hope waits for him ever to act as such toward us. Faith believes eternal life has been given us; hope waits for it sometime to be revealed. Faith is the foundation on which hope leans; hope nourishes faith and sustains it. For as no one can expect from God anything unless he has previously believed God’s promises, so on the other hand ought we by patiently hoping and waiting to sustain and cherish the weakness of our faith, lest it wearily fall. (p. 27)