Fixed errors after rebase

Author: philipr-za

src/ln/channelmanager.rs

@@ -4444,7 +4444,7 @@ mod tests {
 	#[test]
 	fn test_update_fee_that_funder_cannot_afford() {
 		let mut nodes = create_network(2);
-		let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1477, 200000);
+		let chan = create_announced_chan_between_nodes_with_value(&nodes, 0, 1, 1432, 200000);
 		let channel_id = chan.2;
 
 		let feerate = 260;
@@ -4474,9 +4474,9 @@ mod tests {
 			let chan = chan_lock.by_id.get(&channel_id).unwrap();
 
 			let num_htlcs = chan.last_local_commitment_txn[0].output.len();
-			println!("num_htlcs: {}",num_htlcs);
 			let total_fee: u64 = feerate * (super::COMMITMENT_TX_BASE_WEIGHT + (num_htlcs as u64) * super::COMMITMENT_TX_WEIGHT_PER_HTLC) / 1000;
-			assert_eq!(total_fee, 277);
+			let fee_for_single_update_to_commitment = feerate * (super::COMMITMENT_TX_BASE_WEIGHT + 1 * super::COMMITMENT_TX_WEIGHT_PER_HTLC) / 1000;
+			assert_eq!(total_fee, fee_for_single_update_to_commitment);
 		} //drop the mutex
 
 		nodes[0].node.update_fee(channel_id, feerate+1).unwrap();