From 9bdac8a425bdf29d655ae3cf7af0082cfebaa546 Mon Sep 17 00:00:00 2001 From: Jayfromthe13th Date: Tue, 7 Jan 2025 18:55:33 -0600 Subject: [PATCH 1/2] Fix expected_failure attributes in lockbox tests --- framework/libra-framework/sources/ol_sources/lockbox.move | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/libra-framework/sources/ol_sources/lockbox.move b/framework/libra-framework/sources/ol_sources/lockbox.move index f5051ab1c..116013e2c 100644 --- a/framework/libra-framework/sources/ol_sources/lockbox.move +++ b/framework/libra-framework/sources/ol_sources/lockbox.move @@ -385,7 +385,7 @@ module ol_framework::lockbox { } #[test(framework = @0x1, bob_sig = @0x10002)] - #[expected_failure(abort_code = 65545)] // error::invalid_argument(EINVALID_DURATION) + #[expected_failure(abort_code = 65545, location = ol_framework::lockbox)] fun test_non_standard_duration(framework: &signer, bob_sig: &signer) acquires SlowWalletV2 { let bob_addr = signer::address_of(bob_sig); let coin = test_setup(framework, 100); @@ -417,4 +417,4 @@ module ol_framework::lockbox { let balance = balance_duration(bob_addr, 4*12); assert!(balance == 100, 7357003); } -} +} \ No newline at end of file From a1f1a102eee5ad2fef88dbcffe499901c20081a7 Mon Sep 17 00:00:00 2001 From: Jayfromthe13th Date: Fri, 10 Jan 2025 01:04:32 -0600 Subject: [PATCH 2/2] refactor: remove test specification from lockbox.spec.move --- .../sources/ol_sources/lockbox.spec.move | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/framework/libra-framework/sources/ol_sources/lockbox.spec.move b/framework/libra-framework/sources/ol_sources/lockbox.spec.move index e1fdb0744..3bc57563a 100644 --- a/framework/libra-framework/sources/ol_sources/lockbox.spec.move +++ b/framework/libra-framework/sources/ol_sources/lockbox.spec.move @@ -1,5 +1,3 @@ - - spec ol_framework::lockbox { /// Specification for maybe_initialize: @@ -82,23 +80,10 @@ spec ol_framework::lockbox { requires idx < vector::length(global(signer::address_of(user)).list); } - /// Helper function to calculate minimum amount needed to get non-zero drip spec fun min_amount_for_drip(duration_months: u64): u64 { let days = math64::mul_div(duration_months, 365, 12); days / 10000000 + 1 } - - /// Test that verifies a user CANNOT create a lockbox with a non-standard duration - /// This test demonstrates that the DEFAULT_LOCKS list IS enforced - spec test_non_standard_duration(framework: &signer, bob_sig: &signer) { - // Pre-conditions - requires signer::address_of(bob_sig) != @0x0; // Bob must have valid address - - // Post-conditions - // The test should fail when attempting a non-standard duration (e.g., 5*12 months) - // This shows that DEFAULT_LOCKS is enforced - aborts_with error::invalid_argument(EINVALID_DURATION); - } }