China-Iran deal to boost energy and infrastructure