Oil markets are awaiting the next big external shock, as the U.S.-China trade war continues to rage and the prospect of a U.S.-Iran nuclear deal looms ...