More misc bug fixes

substrate/tendermint/src/lib.rs

@@ -367,6 +367,10 @@ impl<N: Network + 'static> TendermintMachine<N> {
     &mut self,
     msg: Message<N::ValidatorId, N::Block, <N::SignatureScheme as SignatureScheme>::Signature>,
   ) -> Result<Option<N::Block>, TendermintError<N::ValidatorId>> {
+    if msg.number != self.number {
+      Err(TendermintError::Temporal)?;
+    }
+
     // Verify the end time and signature if this is a precommit
     if let Data::Precommit(Some((id, sig))) = &msg.data {
       if !self.signer.verify(
@@ -379,10 +383,6 @@ impl<N: Network + 'static> TendermintMachine<N> {
       }
     }
 
-    if msg.number != self.number {
-      Err(TendermintError::Temporal)?;
-    }
-
     // Only let the proposer propose
     if matches!(msg.data, Data::Proposal(..)) &&
       (msg.sender != self.weights.proposer(msg.number, msg.round))

substrate/tendermint/tests/ext.rs

@@ -1,6 +1,6 @@
 use std::{
   sync::Arc,
-  time::{SystemTime, Duration},
+  time::{UNIX_EPOCH, SystemTime, Duration},
 };
 
 use parity_scale_codec::{Encode, Decode};
@@ -104,7 +104,7 @@ impl Network for TestNetwork {
     }
   }
 
-  async fn slash(&mut self, validator: TestValidatorId) {
+  async fn slash(&mut self, _: TestValidatorId) {
     dbg!("Slash");
     todo!()
   }
@@ -135,7 +135,7 @@ impl TestNetwork {
         write.push(TendermintMachine::new(
           TestNetwork(i, arc.clone()),
           i,
-          (BlockNumber(1), SystemTime::now()),
+          (BlockNumber(1), (SystemTime::now().duration_since(UNIX_EPOCH)).unwrap().as_secs()),
           TestBlock { id: 1u32.to_le_bytes(), valid: Ok(()) },
         ));
       }