From 4cfdbff768d8350b6e2575bd96a74aaef955f6d0 Mon Sep 17 00:00:00 2001
From: leeeon233 <leeeon233@gmail.com>
Date: Tue, 13 Dec 2022 23:06:21 +0800
Subject: [PATCH] chore: rebase

---
 crates/loro-core/src/log_store/import.rs | 2 +-
 crates/loro-core/tests/test.rs           | 2 +-
 crates/loro-wasm/src/lib.rs              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/loro-core/src/log_store/import.rs b/crates/loro-core/src/log_store/import.rs
index 873da9f2..0dc06265 100644
--- a/crates/loro-core/src/log_store/import.rs
+++ b/crates/loro-core/src/log_store/import.rs
@@ -112,7 +112,7 @@ impl LogStore {
     fn get_events(&mut self, context: &mut ImportContext) -> Vec<RawEvent> {
         let deleted = self.with_hierarchy(|_, h| h.take_deleted());
         let mut events = Vec::with_capacity(context.diff.len());
-        let mut h = self.hierarchy.try_lock().unwrap();
+        let h = self.hierarchy.try_lock().unwrap();
         let reg = &self.reg;
         for (id, diff) in std::mem::take(&mut context.diff)
             .into_iter()
diff --git a/crates/loro-core/tests/test.rs b/crates/loro-core/tests/test.rs
index 76d46588..b811340e 100644
--- a/crates/loro-core/tests/test.rs
+++ b/crates/loro-core/tests/test.rs
@@ -281,7 +281,7 @@ fn test_encode_state_map() {
 }
 
 #[test]
-fn fields_sort_immutable() {
+fn fix_fields_order() {
     // ContainerType ContainerID Index ID
     // TotalOrderStamp RemoteContent MapSet ListOp DeleteSpan ListSlice (mod test)
     let id = ID::new(0, 1);
diff --git a/crates/loro-wasm/src/lib.rs b/crates/loro-wasm/src/lib.rs
index f9d43ff3..d7e3a803 100644
--- a/crates/loro-wasm/src/lib.rs
+++ b/crates/loro-wasm/src/lib.rs
@@ -141,12 +141,12 @@ impl Loro {
 
     #[wasm_bindgen(js_name = "exportSnapshot")]
     pub fn export_snapshot(&self) -> JsResult<Vec<u8>> {
-        Ok(self.0.encode_snapshot())
+        Ok(self.0.encode_snapshot(false))
     }
 
     #[wasm_bindgen(js_name = "importSnapshot")]
     pub fn import_snapshot(input: Vec<u8>) -> Self {
-        let core = LoroCore::decode_snapshot(&input, None, Default::default());
+        let core = LoroCore::decode_snapshot(&input, Default::default(), None);
         Self(core)
     }