Contaminated Diesel

Dear Members

I am new in this.

Just would like to get your most experts opinions concerning my issue.

I filled up Diesel at the premier gas station and it was contaminated with water. Now what's good with our Innova there is a fuel filter and water trap.

I went back to the gas station and they are most willing to drain and replace the diesel.

What's bothering be me is we did drain and replace does that correct everything or do I need to change some parts?

Loozing forward for all your valuable feedback.

Thank you