remove non compact proof size

client/db/src/bench.rs

@@ -520,12 +520,12 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 		self.state.borrow().as_ref().map_or(sp_state_machine::UsageInfo::empty(), |s| s.usage_info())
 	}
 
-	fn proof_size(&self) -> Option<(u32, u32)> {
+	fn proof_size(&self) -> Option<u32> {
 		self.proof_recorder.as_ref().map(|recorder| {
 			let proof_size = recorder.estimate_encoded_size() as u32;
 			let proof = recorder.to_storage_proof();
 			let proof_recorder_root = self.proof_recorder_root.get();
-			let compact_size = if proof_recorder_root == Default::default() || proof_size == 1 {
+			if proof_recorder_root == Default::default() || proof_size == 1 {
 				// empty trie
 				proof_size
 			} else {
@@ -543,9 +543,7 @@ impl<B: BlockT> StateBackend<HashFor<B>> for BenchmarkingState<B> {
 						proof_size,
 					);
 				}
-			};
-
-			(proof_size, compact_size)
+			}
 		})
 	}
 }

frame/benchmarking/src/analysis.rs

@@ -39,7 +39,6 @@ pub enum BenchmarkSelector {
 	Reads,
 	Writes,
 	ProofSize,
-	CompactProofSize,
 }
 
 #[derive(Debug)]
@@ -89,7 +88,6 @@ impl Analysis {
 				BenchmarkSelector::Reads => result.reads.into(),
 				BenchmarkSelector::Writes => result.writes.into(),
 				BenchmarkSelector::ProofSize => result.proof_size.into(),
-				BenchmarkSelector::CompactProofSize => result.compact_proof_size.into(),
 			}
 		).collect();
 
@@ -131,7 +129,6 @@ impl Analysis {
 						BenchmarkSelector::Reads => result.reads.into(),
 						BenchmarkSelector::Writes => result.writes.into(),
 						BenchmarkSelector::ProofSize => result.proof_size.into(),
-						BenchmarkSelector::CompactProofSize => result.compact_proof_size.into(),
 					};
 					(result.components[i].1, data)
 				})
@@ -197,7 +194,6 @@ impl Analysis {
 					BenchmarkSelector::Reads => result.reads.into(),
 					BenchmarkSelector::Writes => result.writes.into(),
 					BenchmarkSelector::ProofSize => result.proof_size.into(),
-					BenchmarkSelector::CompactProofSize => result.compact_proof_size.into(),
 				})
 		}
 
@@ -379,7 +375,6 @@ mod tests {
 			writes,
 			repeat_writes: 0,
 			proof_size: 0,
-			compact_proof_size: 0,
 		}
 	}
 

frame/benchmarking/src/lib.rs

@@ -787,11 +787,8 @@ macro_rules! impl_benchmark {
 
 							// Calculate the diff caused by the benchmark.
 							let elapsed_extrinsic = finish_extrinsic.saturating_sub(start_extrinsic);
-							let (diff_pov, compact_diff_pov) = match (start_pov, end_pov) {
-								(Some((start, compact_start)), Some((end, compact_end))) => (
-									end.saturating_sub(start),
-									compact_end.saturating_sub(compact_start),
-								),
+							let diff_pov = match (start_pov, end_pov) {
+								(Some(start), Some(end)) => end.saturating_sub(start),
 								_ => Default::default(),
 							};
 
@@ -836,7 +833,6 @@ macro_rules! impl_benchmark {
 								writes: read_write_count.2,
 								repeat_writes: read_write_count.3,
 								proof_size: diff_pov,
-								compact_proof_size: compact_diff_pov,
 							});
 						}
 

frame/benchmarking/src/utils.rs

@@ -63,7 +63,6 @@ pub struct BenchmarkResults {
 	pub writes: u32,
 	pub repeat_writes: u32,
 	pub proof_size: u32,
-	pub compact_proof_size: u32,
 }
 
 /// Configuration used to setup and run runtime benchmarks.
@@ -166,7 +165,7 @@ pub trait Benchmarking {
 	}
 
 	/// Get current estimated proof size.
-	fn proof_size(&self) -> Option<(u32, u32)> {
+	fn proof_size(&self) -> Option<u32> {
 		self.proof_size()
 	}
 }

primitives/externalities/src/lib.rs

@@ -288,7 +288,7 @@ pub trait Externalities: ExtensionStore {
 	///
 	/// Returns estimated proof size for the state queries so far.
 	/// Proof is reset on commit and wipe.
-	fn proof_size(&self) -> Option<(u32, u32)> {
+	fn proof_size(&self) -> Option<u32> {
 		None
 	}
 }

primitives/state-machine/src/backend.rs

@@ -247,7 +247,7 @@ pub trait Backend<H: Hasher>: sp_std::fmt::Debug {
 	fn set_whitelist(&self, _: Vec<TrackedStorageKey>) {}
 
 	/// Estimate proof size
-	fn proof_size(&self) -> Option<(u32, u32)> {
+	fn proof_size(&self) -> Option<u32> {
 		unimplemented!()
 	}
 }

primitives/state-machine/src/ext.rs

@@ -775,7 +775,7 @@ where
 		self.backend.set_whitelist(new)
 	}
 
-	fn proof_size(&self) -> Option<(u32, u32)> {
+	fn proof_size(&self) -> Option<u32> {
 		self.backend.proof_size()
 	}
 }

utils/frame/benchmarking-cli/src/command.rs

@@ -133,15 +133,14 @@ impl BenchmarkCmd {
 							let parameters = &result.components;
 							parameters.iter().for_each(|param| print!("{:?},", param.1));
 							// Print extrinsic time and storage root time
-							print!("{:?},{:?},{:?},{:?},{:?},{:?},{:?},{:?}\n",
+							print!("{:?},{:?},{:?},{:?},{:?},{:?},{:?}\n",
 								result.extrinsic_time,
 								result.storage_root_time,
 								result.reads,
 								result.repeat_reads,
 								result.writes,
 								result.repeat_writes,
 								result.proof_size,
-								result.compact_proof_size,
 							);
 						});
 

utils/frame/benchmarking-cli/src/writer.rs

@@ -422,7 +422,6 @@ mod test {
 					writes: (base + slope * i).into(),
 					repeat_writes: 0,
 					proof_size: 0,
-					compact_proof_size: 0,
 				}
 			)
 		}