Skip to content

Commit

Permalink
Merge pull request #482 from Chia-Network/error-codes
Browse files Browse the repository at this point in the history 
Make ErrorCode comprehensive
  • Loading branch information
@Rigidity
Rigidity authored Apr 23, 2024
2 parents de52ebf + b503059 commit 20cb4b8
Show file tree
Hide file tree
Showing 3 changed files with 299 additions and 83 deletions.
66 changes: 33 additions & 33 deletions crates/chia-consensus/src/gen/conditions.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ pub fn parse_args(
) -> Result<Condition, ValidationErr> {
match op {
AGG_SIG_UNSAFE => {
let pubkey = sanitize_hash(a, first(a, c)?, 48, ErrorCode::InvalidPubkey)?;
let pubkey = sanitize_hash(a, first(a, c)?, 48, ErrorCode::InvalidPublicKey)?;
c = rest(a, c)?;
let message = sanitize_announce_msg(a, first(a, c)?, ErrorCode::InvalidMessage)?;
// AGG_SIG_UNSAFE takes exactly two parameters
Expand All @@ -291,7 +291,7 @@ pub fn parse_args(
}
}
AGG_SIG_ME => {
let pubkey = sanitize_hash(a, first(a, c)?, 48, ErrorCode::InvalidPubkey)?;
let pubkey = sanitize_hash(a, first(a, c)?, 48, ErrorCode::InvalidPublicKey)?;
c = rest(a, c)?;
let message = sanitize_announce_msg(a, first(a, c)?, ErrorCode::InvalidMessage)?;
// AGG_SIG_ME takes exactly two parameters
Expand All @@ -316,7 +316,7 @@ pub fn parse_args(
| AGG_SIG_AMOUNT
| AGG_SIG_PARENT_PUZZLE
| AGG_SIG_PARENT_AMOUNT => {
let pubkey = sanitize_hash(a, first(a, c)?, 48, ErrorCode::InvalidPubkey)?;
let pubkey = sanitize_hash(a, first(a, c)?, 48, ErrorCode::InvalidPublicKey)?;
c = rest(a, c)?;
let message = sanitize_announce_msg(a, first(a, c)?, ErrorCode::InvalidMessage)?;
// AGG_SIG_* take two parameters
Expand All @@ -342,10 +342,10 @@ pub fn parse_args(
let node = first(a, c)?;
let amount = match sanitize_uint(a, node, 8, ErrorCode::InvalidCoinAmount)? {
SanitizedUint::PositiveOverflow => {
return Err(ValidationErr(node, ErrorCode::AmountExceedsMaximum));
return Err(ValidationErr(node, ErrorCode::CoinAmountExceedsMaximum));
}
SanitizedUint::NegativeOverflow => {
return Err(ValidationErr(node, ErrorCode::NegativeAmount));
return Err(ValidationErr(node, ErrorCode::CoinAmountNegative));
}
SanitizedUint::Ok(amount) => amount,
};
Expand Down Expand Up @@ -452,7 +452,7 @@ pub fn parse_args(
}
ASSERT_MY_PUZZLEHASH => {
maybe_check_args_terminator(a, c, flags)?;
let id = sanitize_hash(a, first(a, c)?, 32, ErrorCode::AssertMyPuzzlehashFailed)?;
let id = sanitize_hash(a, first(a, c)?, 32, ErrorCode::AssertMyPuzzleHashFailed)?;
Ok(Condition::AssertMyPuzzlehash(id))
}
ASSERT_MY_AMOUNT => {
Expand Down Expand Up @@ -490,7 +490,7 @@ pub fn parse_args(
ASSERT_SECONDS_RELATIVE => {
maybe_check_args_terminator(a, c, flags)?;
let node = first(a, c)?;
let code = ErrorCode::AssertSecondsRelative;
let code = ErrorCode::AssertSecondsRelativeFailed;
match sanitize_uint(a, node, 8, code)? {
SanitizedUint::PositiveOverflow => Err(ValidationErr(node, code)),
SanitizedUint::NegativeOverflow => Ok(Condition::SkipRelativeCondition),
Expand All @@ -500,7 +500,7 @@ pub fn parse_args(
ASSERT_SECONDS_ABSOLUTE => {
maybe_check_args_terminator(a, c, flags)?;
let node = first(a, c)?;
let code = ErrorCode::AssertSecondsAbsolute;
let code = ErrorCode::AssertSecondsAbsoluteFailed;
match sanitize_uint(a, node, 4, code)? {
SanitizedUint::PositiveOverflow => Err(ValidationErr(node, code)),
SanitizedUint::NegativeOverflow => Ok(Condition::Skip),
Expand All @@ -510,7 +510,7 @@ pub fn parse_args(
ASSERT_HEIGHT_RELATIVE => {
maybe_check_args_terminator(a, c, flags)?;
let node = first(a, c)?;
let code = ErrorCode::AssertHeightRelative;
let code = ErrorCode::AssertHeightRelativeFailed;
match sanitize_uint(a, node, 4, code)? {
SanitizedUint::PositiveOverflow => Err(ValidationErr(node, code)),
SanitizedUint::NegativeOverflow => Ok(Condition::SkipRelativeCondition),
Expand All @@ -520,7 +520,7 @@ pub fn parse_args(
ASSERT_HEIGHT_ABSOLUTE => {
maybe_check_args_terminator(a, c, flags)?;
let node = first(a, c)?;
let code = ErrorCode::AssertHeightAbsolute;
let code = ErrorCode::AssertHeightAbsoluteFailed;
match sanitize_uint(a, node, 4, code)? {
SanitizedUint::PositiveOverflow => Err(ValidationErr(node, code)),
SanitizedUint::NegativeOverflow => Ok(Condition::Skip),
Expand All @@ -530,7 +530,7 @@ pub fn parse_args(
ASSERT_BEFORE_SECONDS_RELATIVE => {
maybe_check_args_terminator(a, c, flags)?;
let node = first(a, c)?;
let code = ErrorCode::AssertBeforeSecondsRelative;
let code = ErrorCode::AssertBeforeSecondsRelativeFailed;
match sanitize_uint(a, node, 8, code)? {
SanitizedUint::PositiveOverflow => Ok(Condition::SkipRelativeCondition),
SanitizedUint::NegativeOverflow => Err(ValidationErr(node, code)),
Expand All @@ -541,7 +541,7 @@ pub fn parse_args(
maybe_check_args_terminator(a, c, flags)?;

let node = first(a, c)?;
let code = ErrorCode::AssertBeforeSecondsAbsolute;
let code = ErrorCode::AssertBeforeSecondsAbsoluteFailed;
match sanitize_uint(a, node, 8, code)? {
SanitizedUint::PositiveOverflow => Ok(Condition::Skip),
SanitizedUint::NegativeOverflow => Err(ValidationErr(node, code)),
Expand All @@ -551,7 +551,7 @@ pub fn parse_args(
ASSERT_BEFORE_HEIGHT_RELATIVE => {
maybe_check_args_terminator(a, c, flags)?;
let node = first(a, c)?;
let code = ErrorCode::AssertBeforeHeightRelative;
let code = ErrorCode::AssertBeforeHeightRelativeFailed;
match sanitize_uint(a, node, 4, code)? {
SanitizedUint::PositiveOverflow => Ok(Condition::SkipRelativeCondition),
SanitizedUint::NegativeOverflow => Err(ValidationErr(node, code)),
Expand All @@ -561,7 +561,7 @@ pub fn parse_args(
ASSERT_BEFORE_HEIGHT_ABSOLUTE => {
maybe_check_args_terminator(a, c, flags)?;
let node = first(a, c)?;
let code = ErrorCode::AssertBeforeHeightAbsolute;
let code = ErrorCode::AssertBeforeHeightAbsoluteFailed;
match sanitize_uint(a, node, 4, code)? {
SanitizedUint::PositiveOverflow => Ok(Condition::Skip),
SanitizedUint::NegativeOverflow => Err(ValidationErr(node, code)),
Expand Down Expand Up @@ -1104,7 +1104,7 @@ pub fn parse_conditions<V: SpendVisitor>(
}
Condition::AssertMyPuzzlehash(hash) => {
if a.atom(hash).as_ref() != a.atom(spend.puzzle_hash).as_ref() {
return Err(ValidationErr(c, ErrorCode::AssertMyPuzzlehashFailed));
return Err(ValidationErr(c, ErrorCode::AssertMyPuzzleHashFailed));
}
}
Condition::CreateCoinAnnouncement(msg) => {
Expand Down Expand Up @@ -2095,27 +2095,27 @@ fn test_single_condition_no_op(#[case] condition: ConditionOpcode, #[case] value
#[case(
ASSERT_SECONDS_ABSOLUTE,
"0x010000000000000000",
ErrorCode::AssertSecondsAbsolute
ErrorCode::AssertSecondsAbsoluteFailed
)]
#[case(
ASSERT_SECONDS_RELATIVE,
"0x010000000000000000",
ErrorCode::AssertSecondsRelative
ErrorCode::AssertSecondsRelativeFailed
)]
#[case(
ASSERT_HEIGHT_ABSOLUTE,
"0x0100000000",
ErrorCode::AssertHeightAbsolute
ErrorCode::AssertHeightAbsoluteFailed
)]
#[case(
ASSERT_HEIGHT_RELATIVE,
"0x0100000000",
ErrorCode::AssertHeightRelative
ErrorCode::AssertHeightRelativeFailed
)]
#[case(
ASSERT_BEFORE_SECONDS_ABSOLUTE,
"-1",
ErrorCode::AssertBeforeSecondsAbsolute
ErrorCode::AssertBeforeSecondsAbsoluteFailed
)]
#[case(
ASSERT_BEFORE_SECONDS_ABSOLUTE,
Expand All @@ -2125,12 +2125,12 @@ fn test_single_condition_no_op(#[case] condition: ConditionOpcode, #[case] value
#[case(
ASSERT_BEFORE_SECONDS_RELATIVE,
"-1",
ErrorCode::AssertBeforeSecondsRelative
ErrorCode::AssertBeforeSecondsRelativeFailed
)]
#[case(
ASSERT_BEFORE_HEIGHT_ABSOLUTE,
"-1",
ErrorCode::AssertBeforeHeightAbsolute
ErrorCode::AssertBeforeHeightAbsoluteFailed
)]
#[case(
ASSERT_BEFORE_HEIGHT_ABSOLUTE,
Expand All @@ -2140,7 +2140,7 @@ fn test_single_condition_no_op(#[case] condition: ConditionOpcode, #[case] value
#[case(
ASSERT_BEFORE_HEIGHT_RELATIVE,
"-1",
ErrorCode::AssertBeforeHeightRelative
ErrorCode::AssertBeforeHeightRelativeFailed
)]
#[case(ASSERT_MY_BIRTH_HEIGHT, "-1", ErrorCode::AssertMyBirthHeightFailed)]
#[case(
Expand Down Expand Up @@ -2589,7 +2589,7 @@ fn test_single_assert_my_puzzle_hash_mismatch() {
cond_test("((({h1} ({h2} (123 (((72 ({h1} )))))")
.unwrap_err()
.1,
ErrorCode::AssertMyPuzzlehashFailed
ErrorCode::AssertMyPuzzleHashFailed
);
}

Expand All @@ -2601,7 +2601,7 @@ fn test_single_invalid_assert_my_puzzle_hash() {
cond_test("((({h1} ({h2} (123 (((72 ({long} )))))")
.unwrap_err()
.1,
ErrorCode::AssertMyPuzzlehashFailed
ErrorCode::AssertMyPuzzleHashFailed
);
}

Expand Down Expand Up @@ -2668,7 +2668,7 @@ fn test_create_coin_amount_exceeds_max() {
cond_test("((({h1} ({h2} (123 (((51 ({h2} (0x010000000000000000 )))))")
.unwrap_err()
.1,
ErrorCode::AmountExceedsMaximum
ErrorCode::CoinAmountExceedsMaximum
);
}

Expand All @@ -2679,7 +2679,7 @@ fn test_create_coin_negative_amount() {
cond_test("((({h1} ({h2} (123 (((51 ({h2} (-1 )))))")
.unwrap_err()
.1,
ErrorCode::NegativeAmount
ErrorCode::CoinAmountNegative
);
}

Expand Down Expand Up @@ -3102,7 +3102,7 @@ fn test_agg_sig_invalid_pubkey(
)
.unwrap_err()
.1,
ErrorCode::InvalidPubkey
ErrorCode::InvalidPublicKey
);
}

Expand Down Expand Up @@ -3417,7 +3417,7 @@ fn test_agg_sig_unsafe_invalid_pubkey() {
cond_test("((({h1} ({h2} (123 (((49 ({h2} ({msg1} )))))")
.unwrap_err()
.1,
ErrorCode::InvalidPubkey
ErrorCode::InvalidPublicKey
);
}

Expand Down Expand Up @@ -4833,15 +4833,15 @@ fn test_limit_messages(#[case] count: i32, #[case] expect_err: Option<ErrorCode>
#[case("(66 (0x3f ({msg2} ({msg1} )", ErrorCode::InvalidCoinId)]
#[case(
"(66 (0x08 ({msg1} ) ((67 (0x08 ({msg1} (-1 )",
ErrorCode::NegativeAmount
ErrorCode::CoinAmountNegative
)]
#[case(
"(66 (0x08 ({msg1} ) ((67 (0x08 ({msg1} )",
ErrorCode::InvalidCondition
)]
#[case(
"(66 (0x01 ({msg1} (-1 ) ((67 (0x01 ({msg1} )",
ErrorCode::NegativeAmount
ErrorCode::CoinAmountNegative
)]
#[case(
"(66 (0x01 ({msg1} ) ((67 (0x01 ({msg1} )",
Expand Down Expand Up @@ -4925,11 +4925,11 @@ fn test_limit_messages(#[case] count: i32, #[case] expect_err: Option<ErrorCode>
// coin amounts can't be negative
#[case(
"(66 (0x01 ({msg1} (-1 ) ((67 (0x01 ({msg1} (123 )",
ErrorCode::NegativeAmount
ErrorCode::CoinAmountNegative
)]
#[case(
"(66 (0x01 ({msg1} (-1 ) ((67 (0x01 ({msg1} (123 )",
ErrorCode::NegativeAmount
ErrorCode::CoinAmountNegative
)]
fn test_message_conditions_failures(#[case] test_case: &str, #[case] expect: ErrorCode) {
for flags in [ENABLE_MESSAGE_CONDITIONS, MEMPOOL_MODE] {
Expand Down
4 changes: 2 additions & 2 deletions crates/chia-consensus/src/gen/messages.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ impl SpendId {
let amount = match sanitize_uint(a, first(a, *args)?, 8, ErrorCode::InvalidCoinAmount)?
{
SanitizedUint::PositiveOverflow => {
return Err(ValidationErr(*args, ErrorCode::AmountExceedsMaximum));
return Err(ValidationErr(*args, ErrorCode::CoinAmountExceedsMaximum));
}
SanitizedUint::NegativeOverflow => {
return Err(ValidationErr(*args, ErrorCode::NegativeAmount));
return Err(ValidationErr(*args, ErrorCode::CoinAmountNegative));
}
SanitizedUint::Ok(amount) => amount,
};
Expand Down
Loading

0 comments on commit 20cb4b8

Please sign in to comment.