Skip to content

Commit

Permalink
implement From<LegacyContractDecompressionError> for ProveBlockError
Browse files Browse the repository at this point in the history
  • Loading branch information
HermanObst committed Aug 30, 2024
1 parent 68a919a commit a1e244b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
12 changes: 9 additions & 3 deletions crates/bin/prove_block/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub enum ProveBlockError {
TreeError(TreeError),
ContractClassError(ContractClassError),
SnOsError(SnOsError),
LegacyClassDecompressionError(LegacyContractDecompressionError),
LegacyContractDecompressionError(LegacyContractDecompressionError),
}

// Implement the Display trait for your error enum
Expand All @@ -64,7 +64,7 @@ impl fmt::Display for ProveBlockError {
ProveBlockError::TreeError(err) => write!(f, "Tree Error: {}", err),
ProveBlockError::ContractClassError(err) => write!(f, "Contract Class Error: {}", err),
ProveBlockError::SnOsError(err) => write!(f, "SnOs Error: {}", err),
ProveBlockError::LegacyClassDecompressionError(err) => {
ProveBlockError::LegacyContractDecompressionError(err) => {
write!(f, "Legacy class decompression Error: {}", err)
}
}
Expand All @@ -80,7 +80,7 @@ impl std::error::Error for ProveBlockError {
ProveBlockError::TreeError(err) => Some(err),
ProveBlockError::ContractClassError(err) => Some(err),
ProveBlockError::SnOsError(err) => Some(err),
ProveBlockError::LegacyClassDecompressionError(err) => Some(err),
ProveBlockError::LegacyContractDecompressionError(err) => Some(err),
}
}
}
Expand Down Expand Up @@ -116,6 +116,12 @@ impl From<SnOsError> for ProveBlockError {
}
}

impl From<LegacyContractDecompressionError> for ProveBlockError {
fn from(err: LegacyContractDecompressionError) -> ProveBlockError {
ProveBlockError::LegacyContractDecompressionError(err)
}
}

fn compute_class_commitment(
previous_class_proofs: &HashMap<Felt, PathfinderClassProof>,
class_proofs: &HashMap<Felt, PathfinderClassProof>,
Expand Down
2 changes: 1 addition & 1 deletion crates/bin/prove_block/src/state_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ async fn build_compiled_class_and_maybe_update_class_hash_to_compiled_class_hash
class_hash_to_compiled_class_hash.insert(*class_hash, compiled_contract_hash.into());
}
starknet::core::types::ContractClass::Legacy(compressed_legacy_cc) => {
let generic_deprecated_cc = GenericDeprecatedCompiledClass::try_from(compressed_legacy_cc).unwrap();
let generic_deprecated_cc = GenericDeprecatedCompiledClass::try_from(compressed_legacy_cc)?;
deprecated_compiled_contract_classes.insert(*class_hash, generic_deprecated_cc);
}
};
Expand Down

0 comments on commit a1e244b

Please sign in to comment.