Merge pull request #2180 from CosmWasm/co/cleanup

Various cleanup
CosmWasm · Jun 26, 2024 · 2b19b49 · 2b19b49
2 parents 7b0d0c7 + 2b4d9fc
commit 2b19b49
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/contracts/burner/.cargo/config → contracts/burner/.cargo/config.toml b/contracts/burner/.cargo/config → contracts/burner/.cargo/config.toml
diff --git a/contracts/crypto-verify/.cargo/config → contracts/crypto-verify/.cargo/config.toml b/contracts/crypto-verify/.cargo/config → contracts/crypto-verify/.cargo/config.toml
diff --git a/contracts/cyberpunk/.cargo/config → contracts/cyberpunk/.cargo/config.toml b/contracts/cyberpunk/.cargo/config → contracts/cyberpunk/.cargo/config.toml
diff --git a/contracts/empty/.cargo/config → contracts/empty/.cargo/config.toml b/contracts/empty/.cargo/config → contracts/empty/.cargo/config.toml
diff --git a/contracts/floaty/.cargo/config → contracts/floaty/.cargo/config.toml b/contracts/floaty/.cargo/config → contracts/floaty/.cargo/config.toml
diff --git a/contracts/floaty/src/floats.rs b/contracts/floaty/src/floats.rs
@@ -126,54 +126,54 @@ pub fn random_subnormal_64(rng: &mut impl RngCore) -> u64 {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Class {
-    Normal,
-    Subnormal,
-    Zero,
-    Infinite,
-    NaN,
-}
+#[cfg(test)]
+mod tests {
+    use rand_chacha::rand_core::SeedableRng;
 
-pub trait Classifier {
-    fn classify(&self) -> Class;
-}
+    use super::*;
 
-impl Classifier for u32 {
-    fn classify(&self) -> Class {
-        let exponent = self & EXPONENT_MASK_32;
-        let mantissa = self & MANTISSA_MASK_32;
-
-        match (exponent, mantissa) {
-            (0, 0) => Class::Zero,
-            (0, _) => Class::Subnormal,
-            (EXPONENT_MASK_32, 0) => Class::Infinite,
-            (EXPONENT_MASK_32, _) => Class::NaN,
-            _ => Class::Normal,
-        }
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    pub enum Class {
+        Normal,
+        Subnormal,
+        Zero,
+        Infinite,
+        NaN,
     }
-}
 
-impl Classifier for u64 {
-    fn classify(&self) -> Class {
-        let exponent = self & EXPONENT_MASK_64;
-        let mantissa = self & MANTISSA_MASK_64;
-
-        match (exponent, mantissa) {
-            (0, 0) => Class::Zero,
-            (0, _) => Class::Subnormal,
-            (EXPONENT_MASK_64, 0) => Class::Infinite,
-            (EXPONENT_MASK_64, _) => Class::NaN,
-            _ => Class::Normal,
-        }
+    pub trait Classifier {
+        fn classify(&self) -> Class;
     }
-}
 
-#[cfg(test)]
-mod tests {
-    use rand_chacha::rand_core::SeedableRng;
+    impl Classifier for u32 {
+        fn classify(&self) -> Class {
+            let exponent = self & EXPONENT_MASK_32;
+            let mantissa = self & MANTISSA_MASK_32;
+
+            match (exponent, mantissa) {
+                (0, 0) => Class::Zero,
+                (0, _) => Class::Subnormal,
+                (EXPONENT_MASK_32, 0) => Class::Infinite,
+                (EXPONENT_MASK_32, _) => Class::NaN,
+                _ => Class::Normal,
+            }
+        }
+    }
 
-    use super::*;
+    impl Classifier for u64 {
+        fn classify(&self) -> Class {
+            let exponent = self & EXPONENT_MASK_64;
+            let mantissa = self & MANTISSA_MASK_64;
+
+            match (exponent, mantissa) {
+                (0, 0) => Class::Zero,
+                (0, _) => Class::Subnormal,
+                (EXPONENT_MASK_64, 0) => Class::Infinite,
+                (EXPONENT_MASK_64, _) => Class::NaN,
+                _ => Class::Normal,
+            }
+        }
+    }
 
     #[test]
     fn test_constants() {

diff --git a/contracts/hackatom/.cargo/config → contracts/hackatom/.cargo/config.toml b/contracts/hackatom/.cargo/config → contracts/hackatom/.cargo/config.toml
diff --git a/contracts/ibc-callbacks/.cargo/config → contracts/ibc-callbacks/.cargo/config.toml b/contracts/ibc-callbacks/.cargo/config → contracts/ibc-callbacks/.cargo/config.toml
diff --git a/contracts/ibc-reflect-send/.cargo/config → ...racts/ibc-reflect-send/.cargo/config.toml b/contracts/ibc-reflect-send/.cargo/config → ...racts/ibc-reflect-send/.cargo/config.toml
diff --git a/contracts/ibc-reflect/.cargo/config → contracts/ibc-reflect/.cargo/config.toml b/contracts/ibc-reflect/.cargo/config → contracts/ibc-reflect/.cargo/config.toml
diff --git a/contracts/queue/.cargo/config → contracts/queue/.cargo/config.toml b/contracts/queue/.cargo/config → contracts/queue/.cargo/config.toml
diff --git a/contracts/reflect/.cargo/config → contracts/reflect/.cargo/config.toml b/contracts/reflect/.cargo/config → contracts/reflect/.cargo/config.toml
diff --git a/contracts/staking/.cargo/config → contracts/staking/.cargo/config.toml b/contracts/staking/.cargo/config → contracts/staking/.cargo/config.toml
diff --git a/contracts/virus/.cargo/config → contracts/virus/.cargo/config.toml b/contracts/virus/.cargo/config → contracts/virus/.cargo/config.toml
diff --git a/packages/core/.cargo/config → packages/core/.cargo/config.toml b/packages/core/.cargo/config → packages/core/.cargo/config.toml
diff --git a/packages/schema/Cargo.toml b/packages/schema/Cargo.toml
@@ -16,6 +16,5 @@ thiserror = "1.0.26"
 
 [dev-dependencies]
 anyhow = "1.0.57"
-cosmwasm-std = { version = "2.1.0-rc.1", path = "../std" }
 semver = "1"
 tempfile = "3"
diff --git a/packages/std/.cargo/config → packages/std/.cargo/config.toml b/packages/std/.cargo/config → packages/std/.cargo/config.toml