Fix CandidateDescriptor debug logs

polkadot/primitives/src/vstaging/mod.rs

@@ -15,6 +15,8 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Staging Primitives.
+use core::fmt::Formatter;
+
 use crate::{slashing::DisputesTimeSlot, ValidatorId, ValidatorIndex, ValidityAttestation};
 
 // Put any primitives used by staging APIs functions here
@@ -66,7 +68,7 @@ pub enum CandidateDescriptorVersion {
 }
 
 /// A unique descriptor of the candidate receipt.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, DecodeWithMemTracking, TypeInfo, RuntimeDebug)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, DecodeWithMemTracking, TypeInfo)]
 #[cfg_attr(feature = "std", derive(Hash))]
 pub struct CandidateDescriptorV2<H = Hash> {
 	/// The ID of the para this is a candidate for.
@@ -99,6 +101,56 @@ pub struct CandidateDescriptorV2<H = Hash> {
 	/// The blake2-256 hash of the validation code bytes.
 	validation_code_hash: ValidationCodeHash,
 }
+impl<H> CandidateDescriptorV2<H> {
+	/// Returns the candidate descriptor version.
+	/// The candidate is at version 2 if the reserved fields are zeroed out
+	/// and the internal `version` field is 0.
+	pub fn version(&self) -> CandidateDescriptorVersion {
+		if self.reserved2 != [0u8; 64] || self.reserved1 != [0u8; 25] {
+			return CandidateDescriptorVersion::V1
+		}
+
+		match self.version.0 {
+			0 => CandidateDescriptorVersion::V2,
+			_ => CandidateDescriptorVersion::Unknown,
+		}
+	}
+}
+
+impl<H> core::fmt::Debug for CandidateDescriptorV2<H>
+where
+	H: core::fmt::Debug,
+{
+	fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
+		match self.version() {
+			CandidateDescriptorVersion::V1 => f
+				.debug_struct("CandidateDescriptorV1")
+				.field("para_id", &self.para_id)
+				.field("relay_parent", &self.relay_parent)
+				.field("persisted_validation_hash", &self.persisted_validation_data_hash)
+				.field("pov_hash", &self.pov_hash)
+				.field("erasure_root", &self.erasure_root)
+				.field("para_head", &self.para_head)
+				.field("validation_code_hash", &self.validation_code_hash)
+				.finish(),
+			CandidateDescriptorVersion::V2 => f
+				.debug_struct("CandidateDescriptorV2")
+				.field("para_id", &self.para_id)
+				.field("relay_parent", &self.relay_parent)
+				.field("core_index", &self.core_index)
+				.field("session_index", &self.session_index)
+				.field("persisted_validation_data_hash", &self.persisted_validation_data_hash)
+				.field("pov_hash", &self.pov_hash)
+				.field("erasure_root", &self.pov_hash)
+				.field("para_head", &self.para_head)
+				.field("validation_code_hash", &self.validation_code_hash)
+				.finish(),
+			CandidateDescriptorVersion::Unknown => {
+				write!(f, "Invalid CandidateDescriptorVersion")
+			},
+		}
+	}
+}
 
 impl<H: Copy> From<CandidateDescriptorV2<H>> for CandidateDescriptor<H> {
 	fn from(value: CandidateDescriptorV2<H>) -> Self {
@@ -589,20 +641,6 @@ impl<H: Copy> CandidateDescriptorV2<H> {
 	impl_getter!(pov_hash, Hash);
 	impl_getter!(validation_code_hash, ValidationCodeHash);
 
-	/// Returns the candidate descriptor version.
-	/// The candidate is at version 2 if the reserved fields are zeroed out
-	/// and the internal `version` field is 0.
-	pub fn version(&self) -> CandidateDescriptorVersion {
-		if self.reserved2 != [0u8; 64] || self.reserved1 != [0u8; 25] {
-			return CandidateDescriptorVersion::V1
-		}
-
-		match self.version.0 {
-			0 => CandidateDescriptorVersion::V2,
-			_ => CandidateDescriptorVersion::Unknown,
-		}
-	}
-
 	fn rebuild_collator_field(&self) -> CollatorId {
 		let mut collator_id = Vec::with_capacity(32);
 		let core_index: [u8; 2] = self.core_index.to_ne_bytes();

prdoc/pr_9255.prdoc

@@ -0,0 +1,12 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Fix CandidateDescriptor debug logs
+
+doc:
+  - audience: Node Dev
+    description: |
+      Implement core::fmt::Debug by hand and differentiate the output based on CandidateDescriptorVersion.
+crates:
+- name: polkadot-primitives
+  bump: minor