Remove code to migrate events

rs/canister/impl/src/lifecycle/mod.rs

@@ -1,4 +1,3 @@
-mod heartbeat;
 mod init;
 mod post_upgrade;
 mod pre_upgrade;

rs/canister/impl/src/lifecycle/post_upgrade.rs

@@ -1,23 +1,13 @@
 use crate::lifecycle::READER_WRITER_BUFFER_SIZE;
-use crate::memory::{
-    get_events_v2_data_memory, get_events_v2_index_memory, get_num_to_string_v2_data_memory,
-    get_num_to_string_v2_index_memory, get_string_to_num_v2_map_memory, get_upgrades_memory,
-};
+use crate::memory::get_upgrades_memory;
 use crate::state;
 use crate::state::State;
 use ic_cdk::post_upgrade;
 use ic_stable_structures::reader::{BufferedReader, Reader};
-use ic_stable_structures::Memory;
 use serde::Deserialize;
 
 #[post_upgrade]
 fn post_upgrade() {
-    get_events_v2_index_memory().write(0, &[0, 0, 0]);
-    get_events_v2_data_memory().write(0, &[0, 0, 0]);
-    get_string_to_num_v2_map_memory().write(0, &[0, 0, 0]);
-    get_num_to_string_v2_index_memory().write(0, &[0, 0, 0]);
-    get_num_to_string_v2_data_memory().write(0, &[0, 0, 0]);
-
     let memory = get_upgrades_memory();
     let reader = BufferedReader::new(READER_WRITER_BUFFER_SIZE, Reader::new(&memory, 0));
     let mut deserializer = rmp_serde::Deserializer::new(reader);

rs/canister/impl/src/state.rs

@@ -2,9 +2,7 @@ use crate::env;
 use crate::model::events::Events;
 use crate::model::salt::Salt;
 use candid::Principal;
-use event_store_canister::{
-    Anonymizable, IdempotentEvent, Milliseconds, TimestampMillis, WhitelistedPrincipals,
-};
+use event_store_canister::{IdempotentEvent, Milliseconds, TimestampMillis, WhitelistedPrincipals};
 use event_store_utils::EventDeduper;
 use serde::{Deserialize, Serialize};
 use std::cell::RefCell;
@@ -24,8 +22,6 @@ pub struct State {
     events: Events,
     #[serde(skip, default = "Events::new_v2")]
     events_v2: Events,
-    #[serde(skip_deserializing)]
-    next_to_migrate: u64,
     event_deduper: EventDeduper,
     salt: Salt,
 }
@@ -68,7 +64,6 @@ impl State {
             events: Events::default(),
             events_v2: Events::new_v2(),
             event_deduper: EventDeduper::default(),
-            next_to_migrate: 0,
             salt: Salt::default(),
         }
     }
@@ -110,34 +105,8 @@ impl State {
                     .saturating_sub(event.timestamp % granularity);
             }
 
-            self.events.push(event, self.salt.get());
-        }
-    }
-
-    pub fn migrate_events(&mut self, count: u32) {
-        let salt = self.salt.get();
-        for mut event in self.events.get(self.next_to_migrate, count as u64) {
-            self.next_to_migrate += 1;
-
-            if event.name != "message_sent" {
-                if let Some(granularity) = self.time_granularity {
-                    event.timestamp = event
-                        .timestamp
-                        .saturating_sub(event.timestamp % granularity);
-                }
-
-                self.events_v2.push(
-                    IdempotentEvent {
-                        idempotency_key: 0,
-                        name: event.name,
-                        timestamp: event.timestamp,
-                        user: event.user.map(Anonymizable::Public),
-                        source: event.source.map(Anonymizable::Public),
-                        payload: event.payload,
-                    },
-                    salt,
-                );
-            }
+            self.events.push(event.clone(), self.salt.get());
+            self.events_v2.push(event, self.salt.get());
         }
     }
 }