Skip to content

Commit

Permalink
Valset: change error String type to str
Browse files Browse the repository at this point in the history
  • Loading branch information
@ueco-jb
ueco-jb committed Feb 9, 2022
1 parent a34708d commit 3543caf
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion contracts/tgrade-valset/src/error.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ pub enum ContractError {

#[error("Invalid metadata - {data} length must be {min}-{max} characters")]
InvalidMetadata {
data: String,
data: &'static str,
min: usize,
max: usize,
},
Expand Down
26 changes: 13 additions & 13 deletions contracts/tgrade-valset/src/msg.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,15 +287,15 @@ impl ValidatorMetadata {
pub fn validate(&self) -> Result<(), ContractError> {
if self.moniker.len() < MIN_MONIKER_LENGTH || self.moniker.len() > MAX_METADATA_SIZE {
return Err(ContractError::InvalidMetadata {
data: "moniker".to_owned(),
data: "moniker",
min: MIN_MONIKER_LENGTH,
max: MAX_METADATA_SIZE,
});
}
if let Some(identity) = &self.identity {
if identity.is_empty() || identity.len() > MAX_METADATA_SIZE {
return Err(ContractError::InvalidMetadata {
data: "identity".to_owned(),
data: "identity",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
});
Expand All @@ -304,7 +304,7 @@ impl ValidatorMetadata {
if let Some(website) = &self.website {
if website.is_empty() || website.len() > MAX_METADATA_SIZE {
return Err(ContractError::InvalidMetadata {
data: "website".to_owned(),
data: "website",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
});
Expand All @@ -313,7 +313,7 @@ impl ValidatorMetadata {
if let Some(security_contract) = &self.security_contact {
if security_contract.is_empty() || security_contract.len() > MAX_METADATA_SIZE {
return Err(ContractError::InvalidMetadata {
data: "security_contract".to_owned(),
data: "security_contract",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
});
Expand All @@ -322,7 +322,7 @@ impl ValidatorMetadata {
if let Some(details) = &self.details {
if details.is_empty() || details.len() > MAX_METADATA_SIZE {
return Err(ContractError::InvalidMetadata {
data: "details".to_owned(),
data: "details",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
});
Expand Down Expand Up @@ -573,7 +573,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "identity".to_owned(),
data: "identity",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE
},
Expand All @@ -587,7 +587,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "website".to_owned(),
data: "website",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
},
Expand All @@ -601,7 +601,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "security_contract".to_owned(),
data: "security_contract",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
},
Expand All @@ -615,7 +615,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "details".to_owned(),
data: "details",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
},
Expand All @@ -632,7 +632,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "identity".to_owned(),
data: "identity",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE
},
Expand All @@ -646,7 +646,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "website".to_owned(),
data: "website",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
},
Expand All @@ -660,7 +660,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "security_contract".to_owned(),
data: "security_contract",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
},
Expand All @@ -674,7 +674,7 @@ mod test {
let resp = meta.validate().unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "details".to_owned(),
data: "details",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE,
},
Expand Down
20 changes: 10 additions & 10 deletions contracts/tgrade-valset/src/multitest/contract.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ fn update_metadata() {
.unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "moniker".to_owned(),
data: "moniker",
min: MIN_MONIKER_LENGTH,
max: MAX_METADATA_SIZE,
},
Expand Down Expand Up @@ -277,7 +277,7 @@ fn register_key_invalid_metadata() {
let mut suite = SuiteBuilder::new()
.with_engagement(&members_init(&members, &[2, 3, 5, 8, 13, 21]))
.with_operators(&members)
.with_min_weight(5)
.with_min_points(5)
.build();

let meta = ValidatorMetadata {
Expand All @@ -293,7 +293,7 @@ fn register_key_invalid_metadata() {
.unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "identity".to_owned(),
data: "identity",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE
},
Expand All @@ -312,7 +312,7 @@ fn register_key_invalid_metadata() {
.unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "identity".to_owned(),
data: "identity",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE
},
Expand All @@ -327,7 +327,7 @@ fn update_metadata_invalid_metadata() {
let mut suite = SuiteBuilder::new()
.with_engagement(&members_init(&members, &[2, 3, 5, 8, 13, 21]))
.with_operators(&members)
.with_min_weight(5)
.with_min_points(5)
.build();

let meta = ValidatorMetadata {
Expand All @@ -340,7 +340,7 @@ fn update_metadata_invalid_metadata() {
let resp = suite.update_metadata(members[0], &meta).unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "identity".to_owned(),
data: "identity",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE
},
Expand All @@ -357,7 +357,7 @@ fn update_metadata_invalid_metadata() {
let resp = suite.update_metadata(members[0], &meta).unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "identity".to_owned(),
data: "identity",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE
},
Expand Down Expand Up @@ -386,7 +386,7 @@ mod instantiate {
let admin = "steakhouse owner".to_owned();
let msg = tg4_stake::msg::InstantiateMsg {
denom: "james bond denom".to_owned(),
tokens_per_weight: Uint128::new(10),
tokens_per_point: Uint128::new(10),
min_bond: Uint128::new(1),
unbonding_period: 1234,
admin: Some(admin.clone()),
Expand Down Expand Up @@ -419,7 +419,7 @@ mod instantiate {
let msg = InstantiateMsg {
admin: None,
membership: stake_addr.into(),
min_weight: 1,
min_points: 1,
max_validators: 120,
epoch_length: 10,
epoch_reward: coin(1, "denom"),
Expand All @@ -437,7 +437,7 @@ mod instantiate {
.unwrap_err();
assert_eq!(
ContractError::InvalidMetadata {
data: "details".to_owned(),
data: "details",
min: MIN_METADATA_SIZE,
max: MAX_METADATA_SIZE
},
Expand Down

0 comments on commit 3543caf

Please sign in to comment.