Move DiscardFunding generation into finish_close_channel