Move Checksum into cosmwasm_std

Author: chipshort

packages/vm/src/checksum.rs renamed to packages/std/src/checksum.rs

@@ -1,8 +1,7 @@
-use std::fmt;
+use core::fmt;
 
 use sha2::{Digest, Sha256};
-
-use crate::errors::VmError;
+use thiserror::Error;
 
 /// A SHA-256 checksum of a Wasm blob, used to identify a Wasm code.
 /// This must remain stable since this checksum is stored in the blockchain state.
@@ -40,12 +39,16 @@ impl From<[u8; 32]> for Checksum {
     }
 }
 
+#[derive(Error, Debug)]
+#[error("Checksum not of length 32")]
+pub struct ChecksumError;
+
 impl TryFrom<&[u8]> for Checksum {
-    type Error = VmError;
+    type Error = ChecksumError;
 
     fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
         if value.len() != 32 {
-            return Err(VmError::cache_err("Checksum not of length 32"));
+            return Err(ChecksumError);
         }
         let mut data = [0u8; 32];
         data.copy_from_slice(value);

packages/std/src/lib.rs

@@ -8,6 +8,7 @@ extern crate alloc;
 mod addresses;
 mod assertions;
 mod binary;
+mod checksum;
 mod coin;
 mod coins;
 mod conversion;
@@ -41,6 +42,7 @@ pub mod storage_keys;
 
 pub use crate::addresses::{instantiate2_address, Addr, CanonicalAddr, Instantiate2AddressError};
 pub use crate::binary::Binary;
+pub use crate::checksum::{Checksum, ChecksumError};
 pub use crate::coin::{coin, coins, has_coins, Coin};
 pub use crate::coins::Coins;
 pub use crate::deps::{Deps, DepsMut, OwnedDeps};

packages/vm/src/cache.rs

@@ -7,9 +7,10 @@ use std::str::FromStr;
 use std::sync::Mutex;
 use wasmer::{Engine, Store};
 
+use cosmwasm_std::Checksum;
+
 use crate::backend::{Backend, BackendApi, Querier, Storage};
 use crate::capabilities::required_capabilities_from_module;
-use crate::checksum::Checksum;
 use crate::compatibility::check_wasm;
 use crate::errors::{VmError, VmResult};
 use crate::filesystem::mkdir_p;

packages/vm/src/lib.rs

@@ -5,7 +5,6 @@ mod backend;
 mod cache;
 mod calls;
 mod capabilities;
-mod checksum;
 mod compatibility;
 mod conversion;
 mod environment;
@@ -41,7 +40,6 @@ pub use crate::calls::{
     call_ibc_packet_receive_raw, call_ibc_packet_timeout, call_ibc_packet_timeout_raw,
 };
 pub use crate::capabilities::capabilities_from_csv;
-pub use crate::checksum::Checksum;
 pub use crate::errors::{
     CommunicationError, CommunicationResult, RegionValidationError, RegionValidationResult,
     VmError, VmResult,

packages/vm/src/modules/file_system_cache.rs

@@ -6,9 +6,9 @@ use thiserror::Error;
 
 use wasmer::{AsEngineRef, DeserializeError, Module, Target};
 
-use crate::checksum::Checksum;
-use crate::errors::{VmError, VmResult};
+use cosmwasm_std::Checksum;
 
+use crate::errors::{VmError, VmResult};
 use crate::filesystem::mkdir_p;
 use crate::modules::current_wasmer_module_version;
 

packages/vm/src/modules/in_memory_cache.rs

@@ -3,8 +3,10 @@ use std::collections::hash_map::RandomState;
 use std::num::NonZeroUsize;
 use wasmer::Module;
 
+use cosmwasm_std::Checksum;
+
 use super::cached_module::CachedModule;
-use crate::{Checksum, Size, VmError, VmResult};
+use crate::{Size, VmError, VmResult};
 
 // Minimum module size.
 // Based on `examples/module_size.sh`, and the cosmwasm-plus contracts.

packages/vm/src/modules/pinned_memory_cache.rs

@@ -1,8 +1,9 @@
+use cosmwasm_std::Checksum;
 use std::collections::HashMap;
 use wasmer::Module;
 
 use super::cached_module::CachedModule;
-use crate::{Checksum, VmResult};
+use crate::VmResult;
 
 /// An pinned in memory module cache
 pub struct PinnedMemoryCache {