Can we merge `Channel::tx_complete` and `Channel::funding_tx_constructed`?

Looks like we can? I think we maybe didn't because at the time those were written we didn't have the `Channel`-can-switch-state-internally stuff done, but now that we do we can probably merge them? cc @dunxen 