simplify check_block

liamaharon · liamaharon · commit 7f8a2d0a2063 · 2025-09-01T13:40:54.000+12:00
diff --git a/node/src/consensus/hybrid_import_queue.rs b/node/src/consensus/hybrid_import_queue.rs
@@ -63,6 +63,7 @@ pub struct HybridBlockImport {
         >,
     >,
     babe_link: BabeLink<Block>,
+    client: Arc<FullClient>,
 }
 
 impl HybridBlockImport {
@@ -92,6 +93,7 @@ impl HybridBlockImport {
             inner_aura,
             inner_babe,
             babe_link,
+            client,
         }
     }
 
@@ -108,7 +110,10 @@ impl BlockImport<Block> for HybridBlockImport {
         &self,
         block: BlockCheckParams<Block>,
     ) -> Result<ImportResult, Self::Error> {
-        self.inner_aura.check_block(block).await.map_err(Into::into)
+        // The Babe and Aura `BlockImport` implementations both defer to the inner
+        // client's `check_block` implementation defined here:
+        // https://github.com/opentensor/polkadot-sdk/blob/d13f915d8a1f55af53fd51fdb4544c47badddc7e/substrate/client/service/src/client/client.rs#L1748.
+        self.client.check_block(block).await.map_err(Into::into)
     }
 
     async fn import_block(

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ pub struct HybridBlockImport {`
`63`	`63`	`>,`
`64`	`64`	`>,`
`65`	`65`	`babe_link: BabeLink<Block>,`
	`66`	`+ client: Arc<FullClient>,`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`impl HybridBlockImport {`
`@@ -92,6 +93,7 @@ impl HybridBlockImport {`
`92`	`93`	`inner_aura,`
`93`	`94`	`inner_babe,`
`94`	`95`	`babe_link,`
	`96`	`+ client,`
`95`	`97`	`}`
`96`	`98`	`}`
`97`	`99`
`@@ -108,7 +110,10 @@ impl BlockImport<Block> for HybridBlockImport {`
`108`	`110`	`&self,`
`109`	`111`	`block: BlockCheckParams<Block>,`
`110`	`112`	`) -> Result<ImportResult, Self::Error> {`
`111`		`- self.inner_aura.check_block(block).await.map_err(Into::into)`
	`113`	+ // The Babe and Aura `BlockImport` implementations both defer to the inner
	`114`	+ // client's `check_block` implementation defined here:
	`115`	`+ // https://github.com/opentensor/polkadot-sdk/blob/d13f915d8a1f55af53fd51fdb4544c47badddc7e/substrate/client/service/src/client/client.rs#L1748.`
	`116`	`+ self.client.check_block(block).await.map_err(Into::into)`
`112`	`117`	`}`
`113`	`118`
`114`	`119`	`async fn import_block(`