Fix TrieError(InvalidStateRoot(...)) error log when runtime upgrade PoV is empty

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 members = ["cli", "core"]
 
 [workspace.package]
-version = "0.5.3"
+version = "0.5.4"
 authors = ["Parity Technologies <[email protected]>"]
 description = "Substrate's programmatic testing framework."
 edition = "2021"

core/src/commands/on_runtime_upgrade.rs

@@ -282,6 +282,11 @@ fn analyse_pov<H>(proof: StorageProof, pre_root: H::Out, no_weight_warnings: boo
 where
     H: Hasher,
 {
+    if proof.is_empty() {
+        log::info!(target: LOG_TARGET, "Empty PoV detected");
+        return WeightSafety::ProbablySafe;
+    }
+
     let encoded_proof_size = proof.encoded_size();
     let compact_proof = proof
         .clone()
@@ -304,7 +309,7 @@ where
             );
             e
         })
-        .unwrap_or_default();
+        .expect("generating compressed proof should never fail if proof is valid");
 
     let proof_nodes = proof.into_nodes();
     log::debug!(

core/tests/on_runtime_upgrade.rs

@@ -249,4 +249,25 @@ mod on_runtime_upgrade {
         })
         .await;
     }
+
+    #[tokio::test]
+    async fn no_migrations_works() {
+        common::run_with_timeout(Duration::from_secs(300), async move {
+            let project_root = env!("CARGO_MANIFEST_DIR");
+            let snap_path = format!("{}/tests/snaps/kusama-asset-hub.snap", project_root);
+            let runtime_path = format!(
+                "{}/tests/runtimes/asset_hub_kusama_runtime_no_migrations.compact.compressed.wasm",
+                project_root
+            );
+            let child = on_runtime_upgrade(
+                snap_path.as_str(),
+                runtime_path.as_str(),
+                &[],
+                &["--disable-spec-version-check"],
+            );
+            let out = child.wait_with_output().await.unwrap();
+            assert!(out.status.success());
+        })
+        .await;
+    }
 }