Let's see how the trade war will play out in the next year.
It will continue but as long as countries rely their oil from Iran, they can be sure China will not abandon them maybe even defend them. There are reasons why they want to establish military power, its the same thing with Israel. What difference do they have that Israel has the right to have the forces and them don't have.
This trade war will not end anytime soon, if you see every President of the Usa creates war like situation to leave a legacy or go on war and save his presidency. I believe so far Iran won't be bothered as India is paying in local Indian currency, and China is yet backing it up. However going ahead I do believe if Iran can't reach for a settlement with Trump, they risk starting a war which will not be good for any country as trade routes and crude prices shall be effected.