Merge pull request #472 from CosmWasm/avoid-statics

Avoid using static for constants

Author: webmaster128

contracts/hackatom/src/contract.rs

@@ -66,7 +66,7 @@ pub struct VerifierResponse {
     pub verifier: HumanAddr,
 }
 
-pub static CONFIG_KEY: &[u8] = b"config";
+pub const CONFIG_KEY: &[u8] = b"config";
 
 pub fn init<S: Storage, A: Api, Q: Querier>(
     deps: &mut Extern<S, A, Q>,

contracts/reflect/src/state.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 use cosmwasm_std::{CanonicalAddr, Storage};
 use cosmwasm_storage::{singleton, singleton_read, ReadonlySingleton, Singleton};
 
-static CONFIG_KEY: &[u8] = b"config";
+const CONFIG_KEY: &[u8] = b"config";
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema)]
 pub struct State {

packages/vm/src/backends/cranelift.rs

@@ -7,7 +7,7 @@ use wasmer_runtime_core::{
 
 use crate::errors::VmResult;
 
-static FAKE_GAS_AVAILABLE: u64 = 1_000_000;
+const FAKE_GAS_AVAILABLE: u64 = 1_000_000;
 
 pub fn compile(code: &[u8]) -> VmResult<Module> {
     let config = CompilerConfig {

packages/vm/src/cache.rs

@@ -12,8 +12,8 @@ use crate::instance::Instance;
 use crate::modules::FileSystemCache;
 use crate::traits::{Api, Extern, Querier, Storage};
 
-static WASM_DIR: &str = "wasm";
-static MODULES_DIR: &str = "modules";
+const WASM_DIR: &str = "wasm";
+const MODULES_DIR: &str = "modules";
 
 #[derive(Debug, Default, Clone)]
 struct Stats {
@@ -162,7 +162,7 @@ mod test {
     use tempfile::TempDir;
     use wabt::wat2wasm;
 
-    static TESTING_GAS_LIMIT: u64 = 400_000;
+    const TESTING_GAS_LIMIT: u64 = 400_000;
     static CONTRACT: &[u8] = include_bytes!("../testdata/contract.wasm");
 
     fn default_features() -> HashSet<String> {

packages/vm/src/compatability.rs

@@ -8,7 +8,7 @@ use crate::features::required_features_from_module;
 
 /// Lists all imports we provide upon instantiating the instance in Instance::from_module()
 /// This should be updated when new imports are added
-static SUPPORTED_IMPORTS: &[&str] = &[
+const SUPPORTED_IMPORTS: &[&str] = &[
     "env.db_read",
     "env.db_write",
     "env.db_remove",
@@ -24,7 +24,7 @@ static SUPPORTED_IMPORTS: &[&str] = &[
 /// Lists all entry points we expect to be present when calling a contract.
 /// Basically, anything that is used in calls.rs
 /// This is unlikely to change much, must be frozen at 1.0 to avoid breaking existing contracts
-static REQUIRED_EXPORTS: &[&str] = &[
+const REQUIRED_EXPORTS: &[&str] = &[
     "cosmwasm_vm_version_2",
     "query",
     "init",
@@ -33,7 +33,7 @@ static REQUIRED_EXPORTS: &[&str] = &[
     "deallocate",
 ];
 
-static MEMORY_LIMIT: u32 = 512; // in pages
+const MEMORY_LIMIT: u32 = 512; // in pages
 
 /// Checks if the data is valid wasm and compatibility with the CosmWasm API (imports and exports)
 pub fn check_wasm(wasm_code: &[u8], supported_features: &HashSet<String>) -> VmResult<()> {
@@ -295,7 +295,7 @@ mod test {
     #[test]
     fn test_check_wasm_exports() {
         // this is invalid, as it doesn't contain all required exports
-        static WAT_MISSING_EXPORTS: &'static str = r#"
+        const WAT_MISSING_EXPORTS: &'static str = r#"
             (module
               (type $t0 (func (param i32) (result i32)))
               (func $add_one (export "add_one") (type $t0) (param $p0 i32) (result i32)

packages/vm/src/context.rs

@@ -255,9 +255,8 @@ pub fn add_iterator<'a, S: Storage, Q: Querier>(
         .try_into()
         .expect("Found more iterator IDs than supported");
     let new_id = last_id + 1;
-    static INT32_MAX_VALUE: u32 = 2_147_483_647;
-    if new_id > INT32_MAX_VALUE {
-        panic!("Iterator ID exceeded INT32_MAX_VALUE. This must not happen.");
+    if new_id > (i32::MAX as u32) {
+        panic!("Iterator ID exceeded i32::MAX. This must not happen.");
     }
     b.iterators.insert(new_id, iter);
     new_id
@@ -356,12 +355,12 @@ mod test {
     type MQ = MockQuerier;
 
     // prepared data
-    static INIT_KEY: &[u8] = b"foo";
-    static INIT_VALUE: &[u8] = b"bar";
+    const INIT_KEY: &[u8] = b"foo";
+    const INIT_VALUE: &[u8] = b"bar";
     // this account has some coins
-    static INIT_ADDR: &str = "someone";
-    static INIT_AMOUNT: u128 = 500;
-    static INIT_DENOM: &str = "TOKEN";
+    const INIT_ADDR: &str = "someone";
+    const INIT_AMOUNT: u128 = 500;
+    const INIT_DENOM: &str = "TOKEN";
 
     const GAS_LIMIT: u64 = 5_000_000;
 

packages/vm/src/features.rs

@@ -3,7 +3,7 @@ use std::collections::HashSet;
 use std::iter::FromIterator;
 use wasmer_runtime_core::{export::Export, Instance as WasmerInstance};
 
-static REQUIRES_PREFIX: &str = "requires_";
+const REQUIRES_PREFIX: &str = "requires_";
 
 /// Takes a comma-separated string, splits it by commas, removes empty elements and returns a set of features.
 /// This can be used e.g. to initialize the cache.

packages/vm/src/imports.rs

@@ -23,16 +23,16 @@ use crate::serde::to_vec;
 use crate::traits::{Api, Querier, Storage};
 
 /// A kibi (kilo binary)
-static KI: usize = 1024;
+const KI: usize = 1024;
 /// Max key length for db_write (i.e. when VM reads from Wasm memory)
-static MAX_LENGTH_DB_KEY: usize = 64 * KI;
+const MAX_LENGTH_DB_KEY: usize = 64 * KI;
 /// Max key length for db_write (i.e. when VM reads from Wasm memory)
-static MAX_LENGTH_DB_VALUE: usize = 128 * KI;
+const MAX_LENGTH_DB_VALUE: usize = 128 * KI;
 /// Typically 20 (Cosmos SDK, Ethereum) or 32 (Nano, Substrate)
 const MAX_LENGTH_CANONICAL_ADDRESS: usize = 32;
 /// The maximum allowed size for bech32 (https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki#bech32)
 const MAX_LENGTH_HUMAN_ADDRESS: usize = 90;
-static MAX_LENGTH_QUERY_CHAIN_REQUEST: usize = 64 * KI;
+const MAX_LENGTH_QUERY_CHAIN_REQUEST: usize = 64 * KI;
 
 /// Reads a storage entry from the VM's storage into Wasm memory
 pub fn do_read<S: Storage, Q: Querier>(ctx: &mut Ctx, key_ptr: u32) -> VmResult<u32> {
@@ -214,15 +214,15 @@ mod test {
     type MQ = MockQuerier;
 
     // prepared data
-    static KEY1: &[u8] = b"ant";
-    static VALUE1: &[u8] = b"insect";
-    static KEY2: &[u8] = b"tree";
-    static VALUE2: &[u8] = b"plant";
+    const KEY1: &[u8] = b"ant";
+    const VALUE1: &[u8] = b"insect";
+    const KEY2: &[u8] = b"tree";
+    const VALUE2: &[u8] = b"plant";
 
     // this account has some coins
-    static INIT_ADDR: &str = "someone";
-    static INIT_AMOUNT: u128 = 500;
-    static INIT_DENOM: &str = "TOKEN";
+    const INIT_ADDR: &str = "someone";
+    const INIT_AMOUNT: u128 = 500;
+    const INIT_DENOM: &str = "TOKEN";
 
     const GAS_LIMIT: u64 = 5_000_000;
 

packages/vm/src/instance.rs

@@ -27,7 +27,7 @@ use crate::imports::{do_next, do_scan};
 use crate::memory::{get_memory_info, read_region, write_region};
 use crate::traits::{Api, Extern, Querier, Storage};
 
-static WASM_PAGE_SIZE: u64 = 64 * 1024;
+const WASM_PAGE_SIZE: u64 = 64 * 1024;
 
 pub struct Instance<S: Storage + 'static, A: Api + 'static, Q: Querier + 'static> {
     /// We put this instance in a box to maintain a constant memory address for the entire
@@ -255,10 +255,10 @@ mod test {
     };
     use wabt::wat2wasm;
 
-    static KIB: usize = 1024;
-    static MIB: usize = 1024 * 1024;
+    const KIB: usize = 1024;
+    const MIB: usize = 1024 * 1024;
+    const DEFAULT_GAS_LIMIT: u64 = 500_000;
     static CONTRACT: &[u8] = include_bytes!("../testdata/contract.wasm");
-    static DEFAULT_GAS_LIMIT: u64 = 500_000;
 
     // shorthands for function generics below
     type MS = MockStorage;