diff --git a/payjoin/src/uri/error.rs b/payjoin/src/uri/error.rs index cce26ecb..eb1636e5 100644 --- a/payjoin/src/uri/error.rs +++ b/payjoin/src/uri/error.rs @@ -7,7 +7,7 @@ pub struct PjParseError(InternalPjParseError); #[derive(Debug)] pub(crate) enum InternalPjParseError { BadPjOs, - MultipleParams(&'static str), + DuplicateParams(&'static str), MissingEndpoint, NotUtf8, BadEndpoint, @@ -24,7 +24,7 @@ impl std::fmt::Display for PjParseError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match &self.0 { InternalPjParseError::BadPjOs => write!(f, "Bad pjos parameter"), - InternalPjParseError::MultipleParams(param) => { + InternalPjParseError::DuplicateParams(param) => { write!(f, "Multiple instances of parameter '{}'", param) } InternalPjParseError::MissingEndpoint => write!(f, "Missing payjoin endpoint"), diff --git a/payjoin/src/uri/mod.rs b/payjoin/src/uri/mod.rs index e26c30ad..89d96b5c 100644 --- a/payjoin/src/uri/mod.rs +++ b/payjoin/src/uri/mod.rs @@ -244,7 +244,7 @@ impl<'a> bip21::de::DeserializationState<'a> for DeserializationState { Ok(bip21::de::ParamKind::Known) } #[cfg(feature = "v2")] - "ohttp" => Err(InternalPjParseError::MultipleParams("ohttp").into()), + "ohttp" => Err(InternalPjParseError::DuplicateParams("ohttp").into()), "pj" if self.pj.is_none() => { let endpoint = Cow::try_from(value).map_err(|_| InternalPjParseError::NotUtf8)?; let url = Url::parse(&endpoint).map_err(|_| InternalPjParseError::BadEndpoint)?; @@ -252,7 +252,7 @@ impl<'a> bip21::de::DeserializationState<'a> for DeserializationState { Ok(bip21::de::ParamKind::Known) } - "pj" => Err(InternalPjParseError::MultipleParams("pj").into()), + "pj" => Err(InternalPjParseError::DuplicateParams("pj").into()), "pjos" if self.pjos.is_none() => { match &*Cow::try_from(value).map_err(|_| InternalPjParseError::BadPjOs)? { "0" => self.pjos = Some(false), @@ -261,7 +261,7 @@ impl<'a> bip21::de::DeserializationState<'a> for DeserializationState { } Ok(bip21::de::ParamKind::Known) } - "pjos" => Err(InternalPjParseError::MultipleParams("pjos").into()), + "pjos" => Err(InternalPjParseError::DuplicateParams("pjos").into()), _ => Ok(bip21::de::ParamKind::Unknown), } }