fix complete build

src/availability.rs

@@ -883,7 +883,9 @@ mod test {
         );
 
         // mock up some consensus data.
-        let leaf = Leaf::<MockTypes>::genesis(&Default::default(), &Default::default()).await;
+        let leaf =
+            Leaf::<MockTypes>::genesis::<TestVersions>(&Default::default(), &Default::default())
+                .await;
         let qc =
             QuorumCertificate::genesis::<TestVersions>(&Default::default(), &Default::default())
                 .await;

src/data_source.rs

@@ -576,7 +576,7 @@ pub mod persistence_tests {
             &TestInstanceState::default(),
         )
         .await;
-        let mut leaf = Leaf::<MockTypes>::genesis(
+        let mut leaf = Leaf::<MockTypes>::genesis::<TestVersions>(
             &TestValidatedState::default(),
             &TestInstanceState::default(),
         )
@@ -628,7 +628,7 @@ pub mod persistence_tests {
             &TestInstanceState::default(),
         )
         .await;
-        let mut leaf = Leaf::<MockTypes>::genesis(
+        let mut leaf = Leaf::<MockTypes>::genesis::<TestVersions>(
             &TestValidatedState::default(),
             &TestInstanceState::default(),
         )
@@ -691,7 +691,7 @@ pub mod persistence_tests {
             &TestInstanceState::default(),
         )
         .await;
-        let mut mock_leaf = Leaf::<MockTypes>::genesis(
+        let mut mock_leaf = Leaf::<MockTypes>::genesis::<TestVersions>(
             &TestValidatedState::default(),
             &TestInstanceState::default(),
         )
@@ -784,7 +784,10 @@ pub mod node_tests {
         state_types::TestInstanceState,
     };
     use hotshot_types::{
-        traits::block_contents::{vid_commitment, EncodeBytes},
+        traits::{
+            block_contents::{vid_commitment, EncodeBytes},
+            node_implementation::Versions,
+        },
         vid::{advz_scheme, VidSchemeType},
     };
     use jf_vid::VidScheme;
@@ -814,7 +817,7 @@ pub mod node_tests {
             .await,
         ];
         let mut blocks = vec![
-            BlockQueryData::<MockTypes>::genesis(
+            BlockQueryData::<MockTypes>::genesis::<TestVersions>(
                 &TestValidatedState::default(),
                 &TestInstanceState::default(),
             )
@@ -943,6 +946,7 @@ pub mod node_tests {
     #[tokio::test(flavor = "multi_thread")]
     pub async fn test_counters<D: TestableDataSource>() {
         use hotshot_example_types::node_types::TestVersions;
+        use vbs::version::StaticVersionType;
 
         setup_test();
 
@@ -969,7 +973,11 @@ pub mod node_tests {
                 .await
                 .unwrap();
             let encoded = payload.encode();
-            let payload_commitment = vid_commitment(&encoded, 1);
+            let payload_commitment = vid_commitment::<TestVersions>(
+                &encoded,
+                1,
+                <TestVersions as Versions>::Base::VERSION,
+            );
             let header = TestBlockHeader {
                 block_number: i,
                 payload_commitment,

src/fetching/provider/query_service.rs

@@ -205,6 +205,7 @@ mod test {
         stream::StreamExt,
     };
     use generic_array::GenericArray;
+    use hotshot_example_types::node_types::TestVersions;
     use portpicker::pick_unused_port;
     use rand::RngCore;
     use std::{future::IntoFuture, time::Duration};
@@ -853,21 +854,19 @@ mod test {
         api.get("get_payload", move |_, _| {
             async move {
                 // No matter what data we are asked for, always respond with dummy data.
-                Ok(
-                    PayloadQueryData::<MockTypes>::genesis(
-                        &Default::default(),
-                        &Default::default(),
-                    )
-                    .await,
+                Ok(PayloadQueryData::<MockTypes>::genesis::<TestVersions>(
+                    &Default::default(),
+                    &Default::default(),
                 )
+                .await)
             }
             .boxed()
         })
         .unwrap()
         .get("get_vid_common", move |_, _| {
             async move {
                 // No matter what data we are asked for, always respond with dummy data.
-                Ok(VidCommonQueryData::<MockTypes>::genesis(
+                Ok(VidCommonQueryData::<MockTypes>::genesis::<TestVersions>(
                     &Default::default(),
                     &Default::default(),
                 )

src/lib.rs

@@ -811,7 +811,9 @@ mod test {
             .unwrap();
 
         // Mock up some data and add a block to the store.
-        let leaf = Leaf::<MockTypes>::genesis(&Default::default(), &Default::default()).await;
+        let leaf =
+            Leaf::<MockTypes>::genesis::<TestVersions>(&Default::default(), &Default::default())
+                .await;
         let qc =
             QuorumCertificate::genesis::<TestVersions>(&Default::default(), &Default::default())
                 .await;

src/node.rs

@@ -216,11 +216,10 @@ mod test {
     use committable::Committable;
     use futures::{FutureExt, StreamExt};
     use hotshot_types::{
-        event::{EventType, LeafInfo},
-        traits::{
+        data::VidDisperseShare, event::{EventType, LeafInfo}, traits::{
             block_contents::{BlockHeader, BlockPayload},
             EncodeBytes,
-        },
+        }
     };
     use portpicker::pick_unused_port;
     use std::time::Duration;
@@ -325,7 +324,10 @@ mod test {
                     .await
                     .unwrap();
                 if let Some(vid_share) = vid_share.as_ref() {
-                    assert_eq!(share, vid_share.share);
+                    match vid_share {
+                        VidDisperseShare::V0(vid_share) => assert_eq!(share, vid_share.share),
+                        VidDisperseShare::V1(vid_share) => assert_eq!(share, vid_share.share),
+                    }
                 }
 
                 // Query various other ways.