seal: distinguish client-side witness and public witness messages

single_use_seals/src/lib.rs

@@ -137,24 +137,26 @@ pub trait SingleUseSeal: Clone + Debug + Display {
 }
 
 pub trait ClientSideWitness {
+    type Message;
     type Seal: SingleUseSeal;
     type Error: Clone + Error;
 
     fn convolve_commit(
         &self,
-        msg: <Self::Seal as SingleUseSeal>::Message,
+        msg: Self::Message,
     ) -> Result<<Self::Seal as SingleUseSeal>::Message, Self::Error>;
 }
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Default)]
 pub struct NoWitness<Seal: SingleUseSeal>(PhantomData<Seal>);
 impl<Seal: SingleUseSeal> ClientSideWitness for NoWitness<Seal> {
+    type Message = Seal::Message;
     type Seal = Seal;
     type Error = Infallible;
 
     fn convolve_commit(
         &self,
-        msg: <Self::Seal as SingleUseSeal>::Message,
+        msg: Self::Message,
     ) -> Result<<Self::Seal as SingleUseSeal>::Message, Self::Error> {
         Ok(msg)
     }
@@ -188,15 +190,15 @@ where Seal: SingleUseSeal
     pub fn verify_seal_closing(
         &self,
         seal: impl Borrow<Seal>,
-        message: Seal::Message,
+        message: <Seal::CliWitness as ClientSideWitness>::Message,
     ) -> Result<(), SealError<Seal>> {
         self.verify_seals_closing([seal], message)
     }
 
     pub fn verify_seals_closing(
         &self,
         seals: impl IntoIterator<Item = impl Borrow<Seal>>,
-        message: Seal::Message,
+        message: <Seal::CliWitness as ClientSideWitness>::Message,
     ) -> Result<(), SealError<Seal>> {
         // ensure that witness includes all seals
         for seal in seals {