Skip to content

Commit

Permalink
clippy and adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
piotr-iohk committed Jan 14, 2025
1 parent b28f1b9 commit b062a09
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
7 changes: 4 additions & 3 deletions src/api/construction_derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ fn to_public_key_compressed(hex: &str) -> Result<CompressedPubKey, MinaMeshError
bits.reverse();

// Create the x-coordinate as a BaseField element
let x = BaseField::from_bits(&bits)
.or_else(|_| Err(MinaMeshError::MalformedPublicKey("Invalid x-coordinate".to_string())))?;
let x =
BaseField::from_bits(&bits).map_err(|_| MinaMeshError::MalformedPublicKey("Invalid x-coordinate".to_string()))?;

// Construct the compressed public key
Ok(CompressedPubKey { x, is_odd })
Expand All @@ -88,6 +88,7 @@ fn decode_token_id(metadata: Option<Value>) -> Result<String, MinaMeshError> {
}

/// Validates the token ID format (base58 and checksum)
/// https://github.com/MinaProtocol/mina/blob/985eda49bdfabc046ef9001d3c406e688bc7ec45/src/lib/base58_check/base58_check.ml
fn validate_base58_token_id(token_id: &str) -> Result<(), MinaMeshError> {
// Decode the token ID using base58
let bytes = bs58::decode(token_id)
Expand All @@ -104,7 +105,7 @@ fn validate_base58_token_id(token_id: &str) -> Result<(), MinaMeshError> {
let (payload, checksum) = bytes.split_at(bytes.len() - 4);

// Recompute checksum
let computed_checksum = sha2::Sha256::digest(&sha2::Sha256::digest(payload));
let computed_checksum = sha2::Sha256::digest(sha2::Sha256::digest(payload));
if &computed_checksum[.. 4] != checksum {
return Err(MinaMeshError::MalformedPublicKey("Token_id checksum mismatch".to_string()));
}
Expand Down
1 change: 1 addition & 0 deletions src/create_router.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ create_handler!(search_transactions, SearchTransactionsRequest);
async fn handle_available_endpoints() -> impl IntoResponse {
Json([
"/account/balance",
"/construction/derive",
"/block",
"/mempool",
"/mempool/transaction",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/construction_derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fn public_keys() -> Vec<String> {
]
}

fn construction_derive_payloads<'a>() -> Vec<Box<dyn erased_serde::Serialize>> {
fn construction_derive_payloads() -> Vec<Box<dyn erased_serde::Serialize>> {
let token_ids = token_ids();
let public_keys = public_keys();

Expand Down

0 comments on commit b062a09

Please sign in to comment.