Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions crates/minibf/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ pub enum Error {
Pagination(PaginationError),
Code(StatusCode),
InvalidAddress,
InvalidStakeAddress,
InvalidAsset,
InvalidPoolId,
InvalidBlockNumber,
Expand Down Expand Up @@ -63,6 +64,15 @@ impl IntoResponse for Error {
)),
)
.into_response(),
Error::InvalidStakeAddress => (
StatusCode::BAD_REQUEST,
Json(ErrorBody::new(
400,
"Bad Request",
Comment on lines +67 to +71

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a little over the top. 🤨 No Error variant has a JSON body test. The only error-body test in the crate is on PaginationError::InvalidFromTo, which is a different type.

"Invalid or malformed stake address format.",
)),
)
.into_response(),
Error::InvalidAsset => (
StatusCode::BAD_REQUEST,
Json(ErrorBody::new(
Expand Down
10 changes: 5 additions & 5 deletions crates/minibf/src/routes/accounts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@ fn stake_address_from_cip_19_credential(address: &str, network: Network) -> Opti
Some(StakeAddress::new(network, payload))
}

fn parse_account_key_param(address: &str, network: Network) -> Result<AccountKeyParam, StatusCode> {
fn parse_account_key_param(address: &str, network: Network) -> Result<AccountKeyParam, Error> {
let address =
if let Some(stake_address) = stake_address_from_cip_19_credential(address, network) {
stake_address
} else {
let parsed = pallas::ledger::addresses::Address::from_bech32(address)
.map_err(|_| StatusCode::BAD_REQUEST)?;
.map_err(|_| Error::InvalidStakeAddress)?;

let stake_address = match parsed {
Address::Shelley(x) => pallas_extras::shelley_address_to_stake_address(&x),
Address::Stake(x) => Some(x),
_ => None,
};

stake_address.ok_or(StatusCode::BAD_REQUEST)?
stake_address.ok_or(Error::InvalidStakeAddress)?
};

let stake_cred = dolos_cardano::pallas_extras::stake_address_to_cred(&address);
Expand Down Expand Up @@ -193,7 +193,7 @@ impl<'a> IntoModel<Vec<AccountAddressesContentInner>> for AccountModelBuilder<'a
pub async fn by_stake<D>(
Path(stake_address): Path<String>,
State(domain): State<Facade<D>>,
) -> Result<Json<AccountContent>, StatusCode>
) -> Result<Json<AccountContent>, Error>
where
Option<AccountState>: From<D::Entity>,
Option<DRepState>: From<D::Entity>,
Expand Down Expand Up @@ -1223,7 +1223,7 @@ mod tests {

let assert_bad_request = |address: String| {
let result = parse_account_key_param(&address, network).err();
assert_eq!(result, Some(StatusCode::BAD_REQUEST));
assert!(matches!(result, Some(Error::InvalidStakeAddress)));
};

// `stake_vk` requires a 32-byte key.
Expand Down
Loading