Use context.WithTimeout instead of context.WithDeadline
There are a few context.WithDeadline calls that can be simplified by using context.WithTimeout. At the time they were added, WithTimeout was too new so we didn't want to depend on it. But now that the minimum Go version has been raised to 1.9, we can simplify the calls. This patch does that simplification, which is purely mechanical, and does not change the logic itself.
Showing with 3 additions and 6 deletions