You may find that having passed a lantern test before you might find you have grandfather rights, but even if not, having passed a lantern test in the past, odds are in your favour that you would pass the CAD test.
I suggest you book your class 2 medical with an aeromedical centre that has the equipment to do a CAD test if necessary. (DOI retired AME and out of touch with current rules so this advice may be wrong.)