New ledger-map compresses blocks by default so no need to compress them here as well

Author: yanliu38

Cargo.lock

@@ -28,9 +28,6 @@ ed25519-dalek = { version = "2", default-features = false, features = [
     "pem",
 ] }
 env_logger = "0.11"
-flate2 = { version = "1.0", features = [
-    "rust_backend",
-], default-features = false }
 fs-err = "2.11"
 hex = "0.4"
 hmac = "0.12"

Cargo.toml

@@ -27,7 +27,6 @@ dcc-common = { path = "../common" }
 decent_cloud_canister = { path = "../ic-canister" }
 dirs.workspace = true
 ed25519-dalek.workspace = true
-flate2.workspace = true
 fs-err.workspace = true
 hex.workspace = true
 hmac.workspace = true

cli/Cargo.toml

@@ -9,8 +9,8 @@ use candid::{Decode, Encode, Nat, Principal as IcPrincipal};
 use chrono::DateTime;
 use dcc_common::{
     account_balance_get_as_string, amount_as_string, cursor_from_data, refresh_caches_from_ledger,
-    zlib_compress, Account, CursorDirection, DccIdentity, FundsTransfer, LedgerCursor,
-    NodeProviderProfile, UpdateProfilePayload, DATA_PULL_BYTES_BEFORE_LEN, LABEL_DC_TOKEN_TRANSFER,
+    Account, CursorDirection, DccIdentity, FundsTransfer, LedgerCursor, NodeProviderProfile,
+    UpdateProfilePayload, DATA_PULL_BYTES_BEFORE_LEN, LABEL_DC_TOKEN_TRANSFER,
 };
 use decent_cloud::ledger_canister_client::LedgerCanister;
 use decent_cloud_canister::DC_TOKEN_TRANSFER_FEE_E9S;
@@ -221,9 +221,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                     let np_profile: NodeProviderProfile =
                         serde_yaml_ng::from_reader(File::open(profile_file)?)?;
 
-                    // Compress the profile with zlib and sign it
-                    let raw_data = serde_json::to_vec(&np_profile)?;
-                    let profile_payload = zlib_compress(&raw_data)?;
+                    // Serialize the profile and sign it
+                    let profile_payload = serde_json::to_vec(&np_profile)?;
                     let signature = dcc_ident.sign(&profile_payload)?.to_vec();
 
                     // Send the payload

cli/src/main.rs

@@ -16,7 +16,6 @@ crc32fast.workspace = true
 data-encoding.workspace = true
 derp.workspace = true
 ed25519-dalek.workspace = true
-flate2.workspace = true
 hex.workspace = true
 hmac.workspace = true
 icrc-ledger-types.workspace = true

common/Cargo.toml

@@ -2,7 +2,6 @@ pub mod account_transfers;
 pub mod account_transfers_errors;
 pub mod cache_balances;
 pub mod cache_transactions;
-pub mod compression;
 pub mod dcc_identity;
 pub mod ledger_cursor;
 pub mod ledger_refresh;
@@ -17,7 +16,6 @@ pub use account_transfers_errors::TransferError;
 pub use cache_balances::*;
 pub use cache_transactions::*;
 use candid::Principal;
-pub use compression::*;
 pub use dcc_identity::{slice_to_32_bytes_array, slice_to_64_bytes_array};
 use icrc_ledger_types::icrc1::account::Account as Icrc1Account;
 pub use ledger_cursor::*;

common/src/compression.rs

@@ -1,6 +1,6 @@
 use crate::{
     charge_fees_to_account_no_bump_reputation, info, reward_e9s_per_block, slice_to_32_bytes_array,
-    zlib_decompress, DccIdentity, ED25519_SIGNATURE_LENGTH, LABEL_NP_OFFERING, LABEL_NP_REGISTER,
+    DccIdentity, ED25519_SIGNATURE_LENGTH, LABEL_NP_OFFERING, LABEL_NP_REGISTER,
     MAX_JSON_ZLIB_PAYLOAD_LENGTH, MAX_UID_LENGTH,
 };
 use candid::Principal;
@@ -155,10 +155,8 @@ pub fn do_get_matching_offerings(ledger: &LedgerMap, filters: SearchFilters) ->
     {
         let payload: UpdateOfferingPayload =
             serde_json::from_slice(entry.value()).expect("Failed to decode payload");
-        let offering: NPOffering = serde_json::from_str(
-            &zlib_decompress(&payload.offering_payload).expect("Failed to decompress"),
-        )
-        .expect("Failed to decode offering");
+        let offering: NPOffering =
+            serde_json::from_slice(&payload.offering_payload).expect("Failed to decode offering");
 
         // If any filter doesn't match, skip this offering
         for filter in &filters {
@@ -326,7 +324,7 @@ pub fn do_get_matching_offerings(ledger: &LedgerMap, filters: SearchFilters) ->
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{do_get_matching_offerings, info, zlib_compress, AvailableUnit, SearchFilter};
+    use crate::{do_get_matching_offerings, info, AvailableUnit, SearchFilter};
     use ledger_map::LedgerMap;
 
     fn log_init() {
@@ -381,7 +379,7 @@ mod tests {
             }],
         };
         let offering_payload = UpdateOfferingPayload {
-            offering_payload: zlib_compress(&serde_json::to_vec(&offering).unwrap()).unwrap(),
+            offering_payload: serde_json::to_vec(&offering).unwrap(),
             signature: vec![],
         };
 

common/src/lib.rs

@@ -1,7 +1,7 @@
 use crate::{
     charge_fees_to_account_no_bump_reputation, info, reputation_get, reward_e9s_per_block,
-    zlib_decompress, DccIdentity, ED25519_SIGNATURE_LENGTH, LABEL_NP_PROFILE,
-    MAX_JSON_ZLIB_PAYLOAD_LENGTH, MAX_UID_LENGTH,
+    DccIdentity, ED25519_SIGNATURE_LENGTH, LABEL_NP_PROFILE, MAX_JSON_ZLIB_PAYLOAD_LENGTH,
+    MAX_UID_LENGTH,
 };
 use candid::Principal;
 #[cfg(target_arch = "wasm32")]
@@ -87,10 +87,8 @@ pub fn do_node_provider_get_profile(ledger: &LedgerMap, np_uid_bytes: Vec<u8>) -
         Ok(profile) => {
             let payload: UpdateProfilePayload =
                 serde_json::from_slice(&profile).expect("Failed to decode profile payload");
-            let profile: NodeProviderProfile = serde_json::from_str(
-                &zlib_decompress(&payload.profile_payload).expect("Failed to decompress profile"),
-            )
-            .expect("Failed to decode profile");
+            let profile: NodeProviderProfile =
+                serde_json::from_slice(&payload.profile_payload).expect("Failed to decode profile");
             let profile_with_reputation = NodeProviderProfileWithReputation {
                 profile,
                 reputation: reputation_get(&np_uid_bytes),

common/src/offerings.rs

@@ -17,7 +17,6 @@ ciborium.workspace = true
 crc32fast.workspace = true
 dcc-common.workspace = true
 ed25519-dalek.workspace = true
-flate2.workspace = true
 hex.workspace = true
 ic-canister-log.workspace = true
 ic-cdk-timers.workspace = true