make Pod derive from Any

Author: dgulotta

src/backends/plonky2/mainpod/mod.rs

@@ -293,9 +293,7 @@ impl PodProver for Prover {
             .signed_pods
             .iter()
             .map(|p| {
-                let p = p
-                    .as_any()
-                    .downcast_ref::<SignedPod>()
+                let p = (*p as &dyn Any).downcast_ref::<SignedPod>()
                     .expect("type SignedPod");
                 p.clone()
             })
@@ -404,13 +402,6 @@ impl Pod for MainPod {
             .collect()
     }
 
-    fn into_any(self: Box<Self>) -> Box<dyn Any> {
-        self
-    }
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
     fn serialized_proof(&self) -> String {
         todo!()
     }

src/backends/plonky2/mock/mainpod.rs

@@ -2,7 +2,7 @@
 // MainPod
 //
 
-use std::{any::Any, fmt};
+use std::fmt;
 
 use anyhow::{anyhow, Result};
 
@@ -274,13 +274,6 @@ impl Pod for MockMainPod {
             .collect()
     }
 
-    fn into_any(self: Box<Self>) -> Box<dyn Any> {
-        self
-    }
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
     fn serialized_proof(&self) -> String {
         todo!()
         // BASE64_STANDARD.encode(serde_json::to_string(self).unwrap())

src/backends/plonky2/mock/signedpod.rs

@@ -1,4 +1,4 @@
-use std::{any::Any, collections::HashMap};
+use std::collections::HashMap;
 
 use anyhow::{anyhow, Result};
 use itertools::Itertools;
@@ -122,13 +122,6 @@ impl Pod for MockSignedPod {
             .collect()
     }
 
-    fn into_any(self: Box<Self>) -> Box<dyn Any> {
-        self
-    }
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
     fn serialized_proof(&self) -> String {
         self.signature.to_string()
     }

src/backends/plonky2/signedpod.rs

@@ -1,4 +1,4 @@
-use std::{any::Any, collections::HashMap};
+use std::collections::HashMap;
 
 use anyhow::{anyhow, Result};
 use itertools::Itertools;
@@ -101,13 +101,6 @@ impl Pod for SignedPod {
             .collect()
     }
 
-    fn into_any(self: Box<Self>) -> Box<dyn Any> {
-        self
-    }
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
-
     fn serialized_proof(&self) -> String {
         let mut buffer = Vec::new();
         use plonky2::util::serialization::Write;
@@ -140,7 +133,7 @@ pub mod tests {
         let sk = SecretKey::new_rand();
         let mut signer = Signer(sk);
         let pod = pod.sign(&mut signer).unwrap();
-        let pod = pod.pod.into_any().downcast::<SignedPod>().unwrap();
+        let pod = (pod.pod as Box<dyn Any>).downcast::<SignedPod>().unwrap();
 
         pod.verify()?;
         println!("id: {}", pod.id());

src/lib.rs

@@ -1,4 +1,5 @@
 #![allow(clippy::get_first)]
+#![feature(trait_upcasting)]
 
 pub mod backends;
 pub mod constants;

src/middleware/mod.rs

@@ -487,7 +487,7 @@ impl Params {
     }
 }
 
-pub trait Pod: fmt::Debug + DynClone {
+pub trait Pod: fmt::Debug + DynClone + Any {
     fn verify(&self) -> Result<()>;
     fn id(&self) -> PodId;
     fn pub_statements(&self) -> Vec<Statement>;
@@ -501,9 +501,6 @@ pub trait Pod: fmt::Debug + DynClone {
             })
             .collect()
     }
-    // Used for downcasting
-    fn into_any(self: Box<Self>) -> Box<dyn Any>;
-    fn as_any(&self) -> &dyn Any;
     // Front-end Pods keep references to middleware Pods. Most of the
     // middleware data can be derived directly from front-end data, but the
     // "proof" data is only created at the point of proving/signing, and
@@ -537,12 +534,6 @@ impl Pod for NonePod {
     fn pub_statements(&self) -> Vec<Statement> {
         Vec::new()
     }
-    fn into_any(self: Box<Self>) -> Box<dyn Any> {
-        self
-    }
-    fn as_any(&self) -> &dyn Any {
-        self
-    }
     fn serialized_proof(&self) -> String {
         "".to_string()
     }