f - Rename Cache methods

Author: jkczyz

lightning-block-sync/src/lib.rs

@@ -158,34 +158,30 @@ pub trait ChainListener {
 /// [`ChainNotifier`]: struct.ChainNotifier.html
 pub trait Cache {
 	/// Retrieves the block header keyed by the given block hash.
-	fn get(&self, block_hash: &BlockHash) -> Option<&ValidatedBlockHeader>;
+	fn look_up(&self, block_hash: &BlockHash) -> Option<&ValidatedBlockHeader>;
 
-	/// Inserts a block header keyed by the given block hash.
-	///
 	/// Called when a block has been connected to the best chain to ensure it is available to be
 	/// disconnected later if needed.
-	fn insert(&mut self, block_hash: BlockHash, block_header: ValidatedBlockHeader);
+	fn block_connected(&mut self, block_hash: BlockHash, block_header: ValidatedBlockHeader);
 
-	/// Removes the block header keyed by the given block hash.
-	///
 	/// Called when a block has been disconnected from the best chain. Once disconnected, a block's
 	/// header is no longer needed and thus can be removed.
-	fn remove(&mut self, block_hash: &BlockHash) -> Option<ValidatedBlockHeader>;
+	fn block_disconnected(&mut self, block_hash: &BlockHash) -> Option<ValidatedBlockHeader>;
 }
 
 /// Unbounded cache of block headers keyed by block hash.
 pub type UnboundedCache = std::collections::HashMap<BlockHash, ValidatedBlockHeader>;
 
 impl Cache for UnboundedCache {
-	fn get(&self, block_hash: &BlockHash) -> Option<&ValidatedBlockHeader> {
+	fn look_up(&self, block_hash: &BlockHash) -> Option<&ValidatedBlockHeader> {
 		self.get(block_hash)
 	}
 
-	fn insert(&mut self, block_hash: BlockHash, block_header: ValidatedBlockHeader) {
+	fn block_connected(&mut self, block_hash: BlockHash, block_header: ValidatedBlockHeader) {
 		self.insert(block_hash, block_header);
 	}
 
-	fn remove(&mut self, block_hash: &BlockHash) -> Option<ValidatedBlockHeader> {
+	fn block_disconnected(&mut self, block_hash: &BlockHash) -> Option<ValidatedBlockHeader> {
 		self.remove(block_hash)
 	}
 }
@@ -229,7 +225,7 @@ impl<C: Cache> ChainNotifier<C> {
 			match &event {
 				&ForkStep::DisconnectBlock(ref header) => {
 					println!("Disconnecting block {}", header.block_hash);
-					if let Some(cached_header) = self.header_cache.remove(&header.block_hash) {
+					if let Some(cached_header) = self.header_cache.block_disconnected(&header.block_hash) {
 						assert_eq!(cached_header, *header);
 					}
 					chain_listener.block_disconnected(&header.header, header.height);
@@ -259,7 +255,7 @@ impl<C: Cache> ChainNotifier<C> {
 				debug_assert_eq!(block.block_hash, header.block_hash);
 
 				println!("Connecting block {}", header.block_hash);
-				self.header_cache.insert(header.block_hash, header);
+				self.header_cache.block_connected(header.block_hash, header);
 				chain_listener.block_connected(&block, header.height);
 				new_tip = Some(header);
 			}
@@ -322,7 +318,7 @@ impl<C: Cache> ChainNotifier<C> {
 		chain_poller: &mut P,
 		header: &ValidatedBlockHeader,
 	) -> BlockSourceResult<ValidatedBlockHeader> {
-		match self.header_cache.get(&header.header.prev_blockhash) {
+		match self.header_cache.look_up(&header.header.prev_blockhash) {
 			Some(prev_header) => Ok(*prev_header),
 			None => chain_poller.look_up_previous_header(header).await,
 		}