@@ -127,48 +127,48 @@ public(package) fun new_capability_for_address(
127127}
128128
129129/// Get the capability's ID
130- public fun cap_id (cap: &Capability ): ID {
130+ public fun id (cap: &Capability ): ID {
131131 object::uid_to_inner (&cap.id)
132132}
133133
134134/// Get the capability's role
135- public fun cap_role (cap: &Capability ): &String {
135+ public fun role (cap: &Capability ): &String {
136136 &cap.role
137137}
138138
139139/// Get the capability's security_vault_id
140- public fun cap_security_vault_id (cap: &Capability ): ID {
140+ public fun security_vault_id (cap: &Capability ): ID {
141141 cap.security_vault_id
142142}
143143
144144/// Check if the capability has a specific role
145- public fun cap_has_role (cap: &Capability , role: &String ): bool {
145+ public fun has_role (cap: &Capability , role: &String ): bool {
146146 &cap.role == role
147147}
148148
149149// Get the capability's issued_to address
150- public fun cap_issued_to (cap: &Capability ): &Option <address > {
150+ public fun issued_to (cap: &Capability ): &Option <address > {
151151 &cap.issued_to
152152}
153153
154154// Get the capability's valid_from timestamp
155- public fun cap_valid_from (cap: &Capability ): &Option <u64 > {
155+ public fun valid_from (cap: &Capability ): &Option <u64 > {
156156 &cap.valid_from
157157}
158158
159159// Get the capability's valid_until timestamp
160- public fun cap_valid_until (cap: &Capability ): &Option <u64 > {
160+ public fun valid_until (cap: &Capability ): &Option <u64 > {
161161 &cap.valid_until
162162}
163163
164164// Check if the capability is currently valid for `clock::timestamp_ms(clock)`
165- public fun cap_is_currently_valid (cap: &Capability , clock: &Clock ): bool {
165+ public fun is_currently_valid (cap: &Capability , clock: &Clock ): bool {
166166 let current_ts = clock::timestamp_ms (clock) / 1000 ; // convert to seconds
167167 cap.is_valid_for_timestamp (current_ts)
168168}
169169
170170// Check if the capability is valid for a specific timestamp (in seconds since Unix epoch)
171- public fun cap_is_valid_for_timestamp (cap: &Capability , timestamp_secs: u64 ): bool {
171+ public fun is_valid_for_timestamp (cap: &Capability , timestamp_secs: u64 ): bool {
172172 let valid_from_ok = if (cap.valid_from.is_some ()) {
173173 let from = cap.valid_from.borrow ();
174174 timestamp_secs >= *from
@@ -185,7 +185,7 @@ public fun cap_is_valid_for_timestamp(cap: &Capability, timestamp_secs: u64): bo
185185}
186186
187187/// Destroy a capability
188- public (package ) fun cap_destroy (cap: Capability ) {
188+ public (package ) fun destroy (cap: Capability ) {
189189 let Capability {
190190 id,
191191 role: _role,
@@ -198,21 +198,6 @@ public(package) fun cap_destroy(cap: Capability) {
198198}
199199
200200#[test_only]
201- public fun cap_destroy_for_testing (cap: Capability ) {
202- cap_destroy (cap);
203- }
204-
205- // ===== public use statements =====
206-
207- public use fun cap_id as Capability .id;
208- public use fun cap_role as Capability .role;
209- public use fun cap_security_vault_id as Capability .security_vault_id;
210- public use fun cap_has_role as Capability .has_role;
211- public use fun cap_destroy as Capability .destroy;
212- public use fun cap_issued_to as Capability .issued_to;
213- public use fun cap_valid_from as Capability .valid_from;
214- public use fun cap_valid_until as Capability .valid_until;
215- public use fun cap_is_currently_valid as Capability .is_currently_valid;
216- public use fun cap_is_valid_for_timestamp as Capability .is_valid_for_timestamp;
217- #[test_only]
218- public use fun cap_destroy_for_testing as Capability .destroy_for_testing;
201+ public fun destroy_for_testing (cap: Capability ) {
202+ destroy (cap);
203+ }
0 commit comments