Skip to content

Commit c1e3882

Browse files
committed
refactor: reorganize and cleanup, remove empty tests
Still leaves some boilerplate this should be tested language for what wouldve been empty files, otherwise removes blank checks that were hints to what tests should be run. Can pass through again and turn them back on.
1 parent a339f78 commit c1e3882

27 files changed

+502
-881
lines changed

contracts/dao/extensions/aibtc-action-proposals.clar

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,19 @@
1818
(define-constant VOTING_PERIOD u144) ;; 144 Bitcoin blocks, ~1 day
1919
(define-constant VOTING_QUORUM u66) ;; 66% of liquid supply
2020

21-
;; error messages - authorization
21+
;; error messages
2222
(define-constant ERR_NOT_DAO_OR_EXTENSION (err u1000))
23-
24-
;; error messages - voting token
25-
(define-constant ERR_INSUFFICIENT_BALANCE (err u1100))
26-
(define-constant ERR_FETCHING_TOKEN_DATA (err u1101))
27-
28-
;; error messages - proposals
29-
(define-constant ERR_PROPOSAL_NOT_FOUND (err u1200))
30-
(define-constant ERR_PROPOSAL_STILL_ACTIVE (err u1201))
31-
(define-constant ERR_SAVING_PROPOSAL (err u1202))
32-
(define-constant ERR_PROPOSAL_ALREADY_CONCLUDED (err u1203))
33-
(define-constant ERR_RETRIEVING_START_BLOCK_HASH (err u1204))
34-
35-
;; error messages - voting
36-
(define-constant ERR_VOTE_TOO_SOON (err u1300))
37-
(define-constant ERR_VOTE_TOO_LATE (err u1301))
38-
(define-constant ERR_ALREADY_VOTED (err u1302))
39-
(define-constant ERR_QUORUM_NOT_REACHED (err u1303))
40-
41-
;; error messages - actions
42-
(define-constant ERR_INVALID_ACTION (err u1400))
23+
(define-constant ERR_INSUFFICIENT_BALANCE (err u1001))
24+
(define-constant ERR_FETCHING_TOKEN_DATA (err u1002))
25+
(define-constant ERR_PROPOSAL_NOT_FOUND (err u1003))
26+
(define-constant ERR_PROPOSAL_STILL_ACTIVE (err u1004))
27+
(define-constant ERR_SAVING_PROPOSAL (err u1005))
28+
(define-constant ERR_PROPOSAL_ALREADY_CONCLUDED (err u1006))
29+
(define-constant ERR_RETRIEVING_START_BLOCK_HASH (err u1007))
30+
(define-constant ERR_VOTE_TOO_SOON (err u1008))
31+
(define-constant ERR_VOTE_TOO_LATE (err u1009))
32+
(define-constant ERR_ALREADY_VOTED (err u1010))
33+
(define-constant ERR_INVALID_ACTION (err u1011))
4334

4435
;; contracts used for voting calculations
4536
(define-constant VOTING_TOKEN_DEX .aibtc-token-dex)

contracts/dao/extensions/aibtc-core-proposals.clar

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,35 +19,19 @@
1919
(define-constant VOTING_PERIOD u144) ;; 144 Bitcoin blocks, ~1 day
2020
(define-constant VOTING_QUORUM u95) ;; 95% of liquid supply
2121

22-
;; error messages - authorization
22+
;; error messages
2323
(define-constant ERR_NOT_DAO_OR_EXTENSION (err u3000))
2424
(define-constant ERR_FETCHING_TOKEN_DATA (err u3001))
25-
26-
;; error messages - treasury
27-
(define-constant ERR_TREASURY_CANNOT_BE_SELF (err u3200))
28-
(define-constant ERR_TREASURY_MISMATCH (err u3201))
29-
(define-constant ERR_TREASURY_CANNOT_BE_SAME (err u3202))
30-
31-
;; error messages - voting token
32-
(define-constant ERR_TOKEN_ALREADY_INITIALIZED (err u3300))
33-
(define-constant ERR_TOKEN_MISMATCH (err u3301))
34-
(define-constant ERR_INSUFFICIENT_BALANCE (err u3302))
35-
(define-constant ERR_TOKEN_CANNOT_BE_SELF (err u3303))
36-
(define-constant ERR_TOKEN_CANNOT_BE_SAME (err u3304))
37-
38-
;; error messages - proposals
39-
(define-constant ERR_PROPOSAL_NOT_FOUND (err u3400))
40-
(define-constant ERR_PROPOSAL_ALREADY_EXECUTED (err u3401))
41-
(define-constant ERR_PROPOSAL_STILL_ACTIVE (err u3402))
42-
(define-constant ERR_SAVING_PROPOSAL (err u3403))
43-
(define-constant ERR_PROPOSAL_ALREADY_CONCLUDED (err u3404))
44-
(define-constant ERR_RETRIEVING_START_BLOCK_HASH (err u3405))
45-
46-
;; error messages - voting
47-
(define-constant ERR_VOTE_TOO_SOON (err u3500))
48-
(define-constant ERR_VOTE_TOO_LATE (err u3501))
49-
(define-constant ERR_ALREADY_VOTED (err u3502))
50-
(define-constant ERR_QUORUM_NOT_REACHED (err u3503))
25+
(define-constant ERR_INSUFFICIENT_BALANCE (err u3002))
26+
(define-constant ERR_PROPOSAL_NOT_FOUND (err u3003))
27+
(define-constant ERR_PROPOSAL_ALREADY_EXECUTED (err u3004))
28+
(define-constant ERR_PROPOSAL_STILL_ACTIVE (err u3005))
29+
(define-constant ERR_SAVING_PROPOSAL (err u3006))
30+
(define-constant ERR_PROPOSAL_ALREADY_CONCLUDED (err u3007))
31+
(define-constant ERR_RETRIEVING_START_BLOCK_HASH (err u3008))
32+
(define-constant ERR_VOTE_TOO_SOON (err u3009))
33+
(define-constant ERR_VOTE_TOO_LATE (err u3010))
34+
(define-constant ERR_ALREADY_VOTED (err u3011))
5135

5236
;; contracts used for voting calculations
5337
(define-constant VOTING_TOKEN_DEX .aibtc-token-dex)

0 commit comments

Comments
 (0)