Cargo format

src/block_metadata.rs

@@ -5,11 +5,15 @@ use hotshot_types::traits::{node_implementation::NodeType, BlockPayload};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 
-pub struct HashableBlock<I: NodeType>(<I as NodeType>::BlockPayload, <<I as NodeType>::BlockPayload as BlockPayload>::Metadata);
+pub struct HashableBlock<I: NodeType>(
+    <I as NodeType>::BlockPayload,
+    <<I as NodeType>::BlockPayload as BlockPayload>::Metadata,
+);
 pub type BlockHash<I: NodeType> = Commitment<HashableBlock<I>>;
 impl<I: NodeType> Default for HashableBlock<I> {
     fn default() -> Self {
-        let (bp, bm) = <I as NodeType>::BlockPayload::from_transactions(Vec::new()).unwrap_or_else(|_|<I as NodeType>::BlockPayload::genesis());
+        let (bp, bm) = <I as NodeType>::BlockPayload::from_transactions(Vec::new())
+            .unwrap_or_else(|_| <I as NodeType>::BlockPayload::genesis());
         Self(bp, bm)
     }
 }
@@ -37,4 +41,3 @@ pub struct BlockMetadata<I: NodeType> {
     offered_fee: u64,
     _phantom: PhantomData<I>,
 }
-

src/builder.rs

@@ -3,13 +3,20 @@ use std::{fmt::Display, path::PathBuf};
 use clap::Args;
 use derive_more::From;
 use futures::FutureExt;
-use hotshot_types::{data::VidCommitment, traits::{node_implementation::NodeType, signature_key::SignatureKey}};
+use hotshot_types::{
+    data::VidCommitment,
+    traits::{node_implementation::NodeType, signature_key::SignatureKey},
+};
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
 use tagged_base64::TaggedBase64;
 use tide_disco::{api::ApiError, method::ReadState, Api, RequestError, StatusCode};
 
-use crate::{api::load_api, block_metadata::BlockHash, data_source::{self, BuilderDataSource}};
+use crate::{
+    api::load_api,
+    block_metadata::BlockHash,
+    data_source::{self, BuilderDataSource},
+};
 
 #[derive(Args, Default)]
 pub struct Options {
@@ -40,7 +47,6 @@ pub enum BuildError {
     Error { message: String },
 }
 
-
 #[derive(Clone, Debug, From, Snafu, Deserialize, Serialize)]
 #[snafu(visibility(pub))]
 pub enum Error {
@@ -65,14 +71,16 @@ pub enum Error {
     },
 }
 
-
 pub fn define_api<State, Types: NodeType>(options: &Options) -> Result<Api<State, Error>, ApiError>
 where
     State: 'static + Send + Sync + ReadState,
     <State as ReadState>::State: Send + Sync + BuilderDataSource<Types>,
     Types: NodeType,
-    <<Types as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType: for<'a> TryFrom<&'a TaggedBase64> + Into<TaggedBase64> + Display,
-    for<'a> <<<Types as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType as TryFrom<&'a TaggedBase64>>::Error: Display,
+    <<Types as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType:
+        for<'a> TryFrom<&'a TaggedBase64> + Into<TaggedBase64> + Display,
+    for<'a> <<<Types as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType as TryFrom<
+        &'a TaggedBase64,
+    >>::Error: Display,
 {
     let mut api = load_api::<State, Error>(
         options.api_path.as_ref(),
@@ -83,21 +91,27 @@ where
         .get("available_blocks", |req, state| {
             async move {
                 let hash = req.blob_param("parent_hash")?;
-                state.get_available_blocks(&hash).await.context(BlockAvailableSnafu {
-                    resource: hash.to_string(),
-                })
+                state
+                    .get_available_blocks(&hash)
+                    .await
+                    .context(BlockAvailableSnafu {
+                        resource: hash.to_string(),
+                    })
             }
             .boxed()
         })?
         .get("claim_block", |req, state| {
             async move {
                 let hash = req.blob_param("block_hash")?;
                 let signature = req.blob_param("signature")?;
-                state.claim_block(&hash, &signature).await.context(BlockClaimSnafu {
-                    resource: hash.to_string(),
-                })
+                state
+                    .claim_block(&hash, &signature)
+                    .await
+                    .context(BlockClaimSnafu {
+                        resource: hash.to_string(),
+                    })
             }
             .boxed()
         })?;
     Ok(api)
-}
+}

src/data_source.rs

@@ -2,18 +2,32 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use commit::Committable;
-use hotshot_types::{data::VidCommitment, traits::{node_implementation::NodeType, signature_key::SignatureKey, BlockPayload}};
+use hotshot_types::{
+    data::VidCommitment,
+    traits::{node_implementation::NodeType, signature_key::SignatureKey, BlockPayload},
+};
 use tagged_base64::TaggedBase64;
 
-use crate::{block_metadata::{BlockHash, BlockMetadata}, builder::BuildError};
+use crate::{
+    block_metadata::{BlockHash, BlockMetadata},
+    builder::BuildError,
+};
 
 #[async_trait]
 pub trait BuilderDataSource<I>
-where I: NodeType,
-    <<I as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType: for<'a> TryFrom<&'a TaggedBase64> + Into<TaggedBase64>
-     {
-    async fn get_available_blocks(&self, for_parent: &VidCommitment) -> Result<Vec<BlockMetadata<I>>, BuildError>;
-    async fn claim_block(&self, block_hash: &BlockHash<I>, signature: &<<I as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType) -> Result<I::BlockPayload, BuildError>;
+where
+    I: NodeType,
+    <<I as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType:
+        for<'a> TryFrom<&'a TaggedBase64> + Into<TaggedBase64>,
+{
+    async fn get_available_blocks(
+        &self,
+        for_parent: &VidCommitment,
+    ) -> Result<Vec<BlockMetadata<I>>, BuildError>;
+    async fn claim_block(
+        &self,
+        block_hash: &BlockHash<I>,
+        signature: &<<I as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType,
+    ) -> Result<I::BlockPayload, BuildError>;
     async fn submit_txn(&self, txn: <I as NodeType>::Transaction) -> Result<(), BuildError>;
 }
-

src/lib.rs

@@ -1,5 +1,5 @@
+mod api;
 pub mod block_metadata;
 pub mod builder;
 pub mod data_source;
 pub mod query_data;
-mod api;

src/query_data.rs

@@ -3,7 +3,6 @@
 //
 // TODO: License
 
-
 use hotshot_types::traits::node_implementation::NodeType;
 use serde::{Deserialize, Serialize};