f names

Author: TheBlueMatt

lightning/src/ln/functional_test_utils.rs

@@ -83,21 +83,21 @@ pub enum ConnectStyle {
 	BestBlockFirst,
 	/// The same as BestBlockFirst, however when we have multiple blocks to connect, we only
 	/// make a single update_best_block call.
-	BlockSkippingBestBlockFirst,
+	BestBlockFirstSkippingBlocks,
 	/// Calls transactions_confirmed first, detecting transactions in the block before updating the
 	/// header and height information.
 	TransactionsFirst,
 	/// The same as TransactionsFirst, however when we have multiple blocks to connect, we only
 	/// make a single update_best_block call.
-	BlockSkippingTransactionsFirst,
+	TransactionsFirstSkippingBlocks,
 	/// Provides the full block via the chain::Listen interface. In the current code this is
 	/// equivalent to TransactionsFirst with some additional assertions.
 	FullBlockViaListen,
 }
 
 pub fn connect_blocks<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, depth: u32) -> BlockHash {
 	let skip_intermediaries = match *node.connect_style.borrow() {
-		ConnectStyle::BlockSkippingBestBlockFirst|ConnectStyle::BlockSkippingTransactionsFirst => true,
+		ConnectStyle::BestBlockFirstSkippingBlocks|ConnectStyle::TransactionsFirstSkippingBlocks => true,
 		_ => false,
 	};
 
@@ -127,11 +127,11 @@ fn do_connect_block<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, block: &Block, s
 	node.chain_monitor.chain_monitor.block_connected(&block.header, &txdata, height);
 	if !skip_manager {
 		match *node.connect_style.borrow() {
-			ConnectStyle::BestBlockFirst|ConnectStyle::BlockSkippingBestBlockFirst => {
+			ConnectStyle::BestBlockFirst|ConnectStyle::BestBlockFirstSkippingBlocks => {
 				node.node.update_best_block(&block.header, height);
 				node.node.transactions_confirmed(&block.header, height, &block.txdata.iter().enumerate().collect::<Vec<_>>());
 			},
-			ConnectStyle::TransactionsFirst|ConnectStyle::BlockSkippingTransactionsFirst => {
+			ConnectStyle::TransactionsFirst|ConnectStyle::TransactionsFirstSkippingBlocks => {
 				node.node.transactions_confirmed(&block.header, height, &block.txdata.iter().enumerate().collect::<Vec<_>>());
 				node.node.update_best_block(&block.header, height);
 			},
@@ -155,7 +155,7 @@ pub fn disconnect_blocks<'a, 'b, 'c, 'd>(node: &'a Node<'b, 'c, 'd>, count: u32)
 			ConnectStyle::FullBlockViaListen => {
 				Listen::block_disconnected(node.node, &orig_header.0, orig_header.1);
 			},
-			ConnectStyle::BlockSkippingBestBlockFirst|ConnectStyle::BlockSkippingTransactionsFirst => {
+			ConnectStyle::BestBlockFirstSkippingBlocks|ConnectStyle::TransactionsFirstSkippingBlocks => {
 				if i == count - 1 {
 					node.node.update_best_block(&prev_header.0, prev_header.1);
 				}