Rename phase and qualify chan, as needed

Now that ChannelPhase has been renamed, drop phase from related
identifiers. Also, qualify uses of chan to avoid overloading the
identifier.

Author: jkczyz

lightning/src/ln/async_signer_tests.rs

@@ -1022,9 +1022,9 @@ fn do_test_closing_signed(extra_closing_signed: bool, reconnect: bool) {
 
 			let per_peer_state = nodes[1].node.per_peer_state.read().unwrap();
 			let mut chan_lock = per_peer_state.get(&nodes[0].node.get_our_node_id()).unwrap().lock().unwrap();
-			let chan = chan_lock.channel_by_id.get_mut(&chan_id).map(|phase| phase.context_mut()).unwrap();
+			let context = chan_lock.channel_by_id.get_mut(&chan_id).map(|chan| chan.context_mut()).unwrap();
 
-			let signer = chan.get_mut_signer().as_mut_ecdsa().unwrap();
+			let signer = context.get_mut_signer().as_mut_ecdsa().unwrap();
 			let signature = signer.sign_closing_transaction(&closing_tx_2, &Secp256k1::new()).unwrap();
 			node_1_closing_signed_2.signature = signature;
 			node_1_closing_signed_2