Remove events_v2 and push_events_v2 (#70)

open-chat-labs · Mar 27, 2024 · d9947c4 · d9947c4
1 parent c111216
commit d9947c4
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 25 deletions.
diff --git a/rs/canister/api/can.did b/rs/canister/api/can.did
@@ -32,8 +32,6 @@ type WhitelistedPrincipals = record {
 };
 service : (InitArgs) -> {
   events : (EventsArgs) -> (EventsResponse) query;
-  events_v2 : (EventsArgs) -> (EventsResponse) query;
   push_events : (PushEventsArgs) -> ();
-  push_events_v2 : (PushEventsArgs) -> ();
   whitelisted_principals : () -> (WhitelistedPrincipals) query;
 }
diff --git a/rs/canister/impl/src/queries/events.rs b/rs/canister/impl/src/queries/events.rs
@@ -5,15 +5,6 @@ use ic_cdk::query;
 
 #[query(guard = "caller_can_read_events")]
 fn events(args: EventsArgs) -> EventsResponse {
-    events_inner(args)
-}
-
-#[query(guard = "caller_can_read_events")]
-fn events_v2(args: EventsArgs) -> EventsResponse {
-    events_inner(args)
-}
-
-fn events_inner(args: EventsArgs) -> EventsResponse {
     state::read(|s| {
         let stats = s.events().stats();
         let events = s.events().get(args.start, args.length);

diff --git a/rs/canister/impl/src/updates/push_events.rs b/rs/canister/impl/src/updates/push_events.rs
@@ -5,15 +5,6 @@ use ic_cdk::update;
 
 #[update(guard = "caller_can_push_events")]
 fn push_events(args: PushEventsArgs) {
-    push_events_inner(args)
-}
-
-#[update(guard = "caller_can_push_events")]
-fn push_events_v2(args: PushEventsArgs) {
-    push_events_inner(args)
-}
-
-fn push_events_inner(args: PushEventsArgs) {
     let now = env::time();
 
     state::mutate(|s| {

diff --git a/rs/integration_tests/src/client.rs b/rs/integration_tests/src/client.rs
@@ -18,7 +18,7 @@ pub fn push_events(
     canister_id: Principal,
     args: &PushEventsArgs,
 ) {
-    execute_update_no_response(env, sender, canister_id, "push_events_v2", args)
+    execute_update_no_response(env, sender, canister_id, "push_events", args)
 }
 
 fn execute_query<P: CandidType, R: CandidType + DeserializeOwned>(

diff --git a/ts/consumer/src/candid/idl.js b/ts/consumer/src/candid/idl.js
@@ -36,9 +36,7 @@ export const idlFactory = ({ IDL }) => {
   });
   return IDL.Service({
     'events' : IDL.Func([EventsArgs], [EventsResponse], ['query']),
-    'events_v2' : IDL.Func([EventsArgs], [EventsResponse], ['query']),
     'push_events' : IDL.Func([PushEventsArgs], [], []),
-    'push_events_v2' : IDL.Func([PushEventsArgs], [], []),
     'whitelisted_principals' : IDL.Func([], [WhitelistedPrincipals], ['query']),
   });
 };

diff --git a/ts/consumer/src/candid/types.d.ts b/ts/consumer/src/candid/types.d.ts
@@ -36,8 +36,6 @@ export interface WhitelistedPrincipals {
 }
 export interface _SERVICE {
   'events' : ActorMethod<[EventsArgs], EventsResponse>,
-  'events_v2' : ActorMethod<[EventsArgs], EventsResponse>,
   'push_events' : ActorMethod<[PushEventsArgs], undefined>,
-  'push_events_v2' : ActorMethod<[PushEventsArgs], undefined>,
   'whitelisted_principals' : ActorMethod<[], WhitelistedPrincipals>,
 }