The White House engaged in a brief trade war with Canada on Tuesday over energy surcharges and steel tariffs. Cooler heads prevailed but markets weren't calmed.