From b747452ced2b5501f19b7eb7f9310fda967705ec Mon Sep 17 00:00:00 2001
From: Zixuan Chen <remch183@outlook.com>
Date: Tue, 4 Jul 2023 12:35:34 +0800
Subject: [PATCH] refactor: replace containerIdx with ContainerID in refactor
 module

---
 crates/loro-internal/src/refactor/arena.rs     |  4 +---
 crates/loro-internal/src/refactor/diff_calc.rs |  4 ++--
 crates/loro-internal/src/refactor/state.rs     | 11 ++++++++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/crates/loro-internal/src/refactor/arena.rs b/crates/loro-internal/src/refactor/arena.rs
index 9bb87ed1..11db3026 100644
--- a/crates/loro-internal/src/refactor/arena.rs
+++ b/crates/loro-internal/src/refactor/arena.rs
@@ -8,8 +8,6 @@ use crate::container::{ContainerID, ContainerIdx};
 ///
 #[derive(Clone)]
 pub(super) struct SharedArena {
-    containers: Vector<ContainerID>,
-    id_to_idx: im::HashMap<ContainerID, ContainerIdx>,
     /// The parent of each container.
-    parents: Vector<Option<ContainerIdx>>,
+    parents: im::HashMap<ContainerID, ContainerID>,
 }
diff --git a/crates/loro-internal/src/refactor/diff_calc.rs b/crates/loro-internal/src/refactor/diff_calc.rs
index 1ea35591..f63f2aa8 100644
--- a/crates/loro-internal/src/refactor/diff_calc.rs
+++ b/crates/loro-internal/src/refactor/diff_calc.rs
@@ -1,12 +1,12 @@
 use fxhash::FxHashMap;
 
-use crate::container::ContainerIdx;
+use crate::container::{ContainerID, ContainerIdx};
 
 /// Calculate the diff between two versions. given [OpLog][super::oplog::OpLog]
 /// and [AppState][super::state::AppState].
 #[derive(Default)]
 pub(super) struct DiffCalculator {
-    calc: FxHashMap<ContainerIdx, ContainerDiffCalculator>,
+    calc: FxHashMap<ContainerID, ContainerDiffCalculator>,
 }
 impl DiffCalculator {
     pub(crate) fn calc(
diff --git a/crates/loro-internal/src/refactor/state.rs b/crates/loro-internal/src/refactor/state.rs
index b18cce3b..5b28fedf 100644
--- a/crates/loro-internal/src/refactor/state.rs
+++ b/crates/loro-internal/src/refactor/state.rs
@@ -1,7 +1,12 @@
 use enum_dispatch::enum_dispatch;
 use fxhash::FxHashMap;
 
-use crate::{container::ContainerIdx, event::Diff, version::Frontiers, VersionVector};
+use crate::{
+    container::{ContainerID, ContainerIdx},
+    event::Diff,
+    version::Frontiers,
+    VersionVector,
+};
 
 use super::arena::SharedArena;
 
@@ -17,7 +22,7 @@ use text_state::TextState;
 pub struct AppState {
     vv: VersionVector,
     frontiers: Frontiers,
-    state: FxHashMap<ContainerIdx, State>,
+    state: FxHashMap<ContainerID, State>,
     arena: SharedArena,
 }
 
@@ -39,6 +44,6 @@ pub struct AppStateDiff {
 }
 
 pub struct ContainerStateDiff {
-    pub idx: ContainerIdx,
+    pub idx: ContainerID,
     pub diff: Diff,
 }