Fix ci with really correct bugfix...

solana-labs · Oct 3, 2023 · 35dd937 · 35dd937
1 parent d361605
commit 35dd937
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 10 deletions.
diff --git a/frozen-abi/src/abi_digester.rs b/frozen-abi/src/abi_digester.rs
@@ -85,12 +85,12 @@ impl AbiDigester {
         }
     }
 
-    pub fn create_new_opaque(&self, top_scope: &str) -> Self {
+    pub fn create_new_opaque(&self, scope: &str) -> Self {
         Self {
             data_types: self.data_types.clone(),
             depth: self.depth,
             for_enum: false,
-            opaque_scope: Some(top_scope.to_owned()),
+            opaque_scope: Some(scope.to_owned()),
         }
     }
 
@@ -124,7 +124,7 @@ impl AbiDigester {
         let type_name = normalize_type_name(type_name::<T>());
         if type_name.ends_with("__SerializeWith")
             || (self.opaque_scope.is_some()
-                && type_name.starts_with(self.opaque_scope.as_ref().unwrap()))
+                && type_name.contains(self.opaque_scope.as_ref().unwrap()))
         {
             // we can't use the AbiEnumVisitor trait for these cases.
             value.serialize(self.create_new())

diff --git a/frozen-abi/src/abi_example.rs b/frozen-abi/src/abi_example.rs
@@ -480,7 +480,9 @@ pub trait AbiEnumVisitor: Serialize {
 }
 
 pub trait IgnoreAsHelper {}
-pub trait EvenAsOpaque {}
+pub trait EvenAsOpaque {
+    const SCOPE: Option<&'static str> = None;
+}
 
 impl<T: Serialize + ?Sized> AbiEnumVisitor for T {
     default fn visit_for_abi(&self, _digester: &mut AbiDigester) -> DigestResult {
@@ -493,8 +495,11 @@ impl<T: Serialize + ?Sized> AbiEnumVisitor for T {
 
 impl<T: Serialize + ?Sized + AbiExample> AbiEnumVisitor for T {
     default fn visit_for_abi(&self, digester: &mut AbiDigester) -> DigestResult {
-        info!("AbiEnumVisitor for (default): {}", type_name::<T>());
-        self.serialize(digester.create_new())
+        info!("AbiEnumVisitor for T: {}", type_name::<T>());
+        // not calling self.serialize(...) is intentional here as the most generic impl
+        // consider IgnoreAsHelper and EvenAsOpaque if you're stuck on this....
+        T::example()
+            .serialize(digester.create_new())
             .map_err(DigestError::wrap_by_type::<T>)
     }
 }
@@ -504,7 +509,7 @@ impl<T: Serialize + ?Sized + AbiExample> AbiEnumVisitor for T {
 // relevant test: TestVecEnum
 impl<T: Serialize + ?Sized + AbiEnumVisitor> AbiEnumVisitor for &T {
     default fn visit_for_abi(&self, digester: &mut AbiDigester) -> DigestResult {
-        info!("AbiEnumVisitor for (&default): {}", type_name::<T>());
+        info!("AbiEnumVisitor for &T: {}", type_name::<T>());
         // Don't call self.visit_for_abi(...) to avoid the infinite recursion!
         T::visit_for_abi(self, digester)
     }
@@ -524,9 +529,17 @@ impl<T: Serialize + IgnoreAsHelper> AbiEnumVisitor for &T {
 // inability of implementing AbiExample for private structs from other crates
 impl<T: Serialize + IgnoreAsHelper + EvenAsOpaque> AbiEnumVisitor for &T {
     default fn visit_for_abi(&self, digester: &mut AbiDigester) -> DigestResult {
-        info!("AbiEnumVisitor for (IgnoreAsOpaque): {}", type_name::<T>());
-        let top_scope = type_name::<T>().split("::").next().unwrap();
-        self.serialize(digester.create_new_opaque(top_scope))
+        let type_name = type_name::<T>();
+        let scope = if let Some(scope) = T::SCOPE {
+            scope
+        } else {
+            type_name.split("::").next().unwrap()
+        };
+        info!(
+            "AbiEnumVisitor for (EvenAsOpaque): {}: scope: {}",
+            type_name, scope
+        );
+        self.serialize(digester.create_new_opaque(scope))
             .map_err(DigestError::wrap_by_type::<T>)
     }
 }

diff --git a/sdk/src/packet.rs b/sdk/src/packet.rs
@@ -52,6 +52,14 @@ impl ::solana_frozen_abi::abi_example::AbiExample for PacketFlags {
     }
 }
 
+#[cfg(RUSTC_WITH_SPECIALIZATION)]
+impl ::solana_frozen_abi::abi_example::IgnoreAsHelper for PacketFlags {}
+
+#[cfg(RUSTC_WITH_SPECIALIZATION)]
+impl ::solana_frozen_abi::abi_example::EvenAsOpaque for PacketFlags {
+    const SCOPE: Option<&'static str> = Some("InternalBitFlags");
+}
+
 // serde_as is used as a work around because array isn't supported by serde
 // (and serde_bytes).
 //