Skip to content

Commit f7c4c68

Browse files
committed
fix: use existing destroy_handlefun
1 parent 8567643 commit f7c4c68

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

aptos-move/framework/aptos-framework/sources/account.move

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ module aptos_framework::account {
255255
signer_capability_offer,
256256
} = move_from<Account>(from);
257257

258-
event::destroy_event_handle(account, coin_register_events);
259-
event::destroy_event_handle(account, key_rotation_events);
258+
event::destroy_handle<CoinRegisterEvent>(coin_register_events);
259+
event::destroy_handle<KeyRotationEvent>(key_rotation_events);
260260

261261
let CapabilityOffer { for: _ } = rotation_capability_offer;
262262
let CapabilityOffer { for: _ } = signer_capability_offer;

aptos-move/framework/aptos-framework/sources/event.move

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ module aptos_framework::event {
4040
guid: GUID,
4141
}
4242

43-
public fun destroy_event_handle<T: drop + store>(account: &signer, handle: EventHandle<T>) {
44-
system_addresses::assert_aptos_framework(account);
45-
46-
let EventHandle { counter: _, guid: _ } = handle;
47-
}
48-
4943
#[deprecated]
5044
/// Use EventHandleGenerator to generate a unique event handle for `sig`
5145
public(friend) fun new_event_handle<T: drop + store>(guid: GUID): EventHandle<T> {
@@ -112,6 +106,6 @@ module aptos_framework::event {
112106
#[test(account = @0x1)]
113107
public entry fun test_destroy_event_handle(account: signer) {
114108
let handle = create_test_event_handle<TestEvent>();
115-
destroy_event_handle(&account, handle);
109+
destroy_handle<TestEvent>(handle);
116110
}
117111
}

0 commit comments

Comments
 (0)