Fix CI for no_std

Signed-off-by: aeryz <[email protected]>

Author: aeryz

.circleci/config.yml

@@ -268,21 +268,21 @@ jobs:
           working_directory: ~/project/packages/std
           command: cargo wasm --locked --no-default-features
       - run:
-          name: Run unit tests (no features)
+          name: Run unit tests (only "std" feature)
           working_directory: ~/project/packages/std
-          command: cargo test --locked --no-default-features
+          command: cargo test --locked --no-default-features --features std
       - run:
           name: Build library for native target (all features)
           working_directory: ~/project/packages/std
-          command: cargo build --locked --features abort,iterator,staking,stargate,cosmwasm_1_1
+          command: cargo build --locked --features abort,iterator,staking,stargate,std,cosmwasm_1_1
       - run:
           name: Build library for wasm target (all features)
           working_directory: ~/project/packages/std
-          command: cargo wasm --locked --features abort,iterator,staking,stargate,cosmwasm_1_1
+          command: cargo wasm --locked --features abort,iterator,staking,stargate,std,cosmwasm_1_1
       - run:
           name: Run unit tests (all features)
           working_directory: ~/project/packages/std
-          command: cargo test --locked --features abort,iterator,staking,stargate,cosmwasm_1_1
+          command: cargo test --locked --features abort,iterator,staking,stargate,std,cosmwasm_1_1
       - run:
           name: Build and run schema generator
           working_directory: ~/project/packages/std

packages/std/src/exports.rs

@@ -7,6 +7,8 @@
 //! and `do_sudo` should be wrapped with a extern "C" entry point including
 //! the contract-specific function pointer. This is done via the `#[entry_point]`
 //! macro attribute from cosmwasm-derive.
+#![cfg(feature = "std")]
+
 use alloc::string::ToString;
 use alloc::vec::Vec;
 use core::marker::PhantomData;
@@ -22,7 +24,7 @@ use crate::ibc::{
 };
 use crate::imports::{ExternalApi, ExternalQuerier, ExternalStorage};
 use crate::memory::{alloc, consume_region, release_buffer, Region};
-#[cfg(all(feature = "abort", feature = "std"))]
+#[cfg(feature = "abort")]
 use crate::panic::install_panic_handler;
 use crate::query::CustomQuery;
 use crate::results::{ContractResult, QueryResponse, Reply, Response};
@@ -101,7 +103,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_instantiate(
         instantiate_fn,
@@ -131,7 +133,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_execute(
         execute_fn,
@@ -160,7 +162,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_migrate(migrate_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -184,7 +186,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_sudo(sudo_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -207,7 +209,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_reply(reply_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -229,7 +231,7 @@ where
     M: DeserializeOwned,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_query(query_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -252,7 +254,7 @@ where
     Q: CustomQuery,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_ibc_channel_open(contract_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -277,7 +279,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_ibc_channel_connect(contract_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -302,7 +304,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_ibc_channel_close(contract_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -328,7 +330,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_ibc_packet_receive(contract_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -354,7 +356,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_ibc_packet_ack(contract_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();
@@ -381,7 +383,7 @@ where
     C: CustomMsg,
     E: ToString,
 {
-    #[cfg(all(feature = "abort", feature = "std"))]
+    #[cfg(feature = "abort")]
     install_panic_handler();
     let res = _do_ibc_packet_timeout(contract_fn, env_ptr as *mut Region, msg_ptr as *mut Region);
     let v = to_vec(&res).unwrap();

packages/std/src/imports.rs

@@ -1,3 +1,5 @@
+#![cfg(feature = "std")]
+
 #[cfg(feature = "iterator")]
 use alloc::boxed::Box;
 use alloc::string::String;

packages/std/src/lib.rs

@@ -89,23 +89,24 @@ pub use crate::types::{BlockInfo, ContractInfo, Env, MessageInfo, TransactionInf
 
 // Exposed in wasm build only
 
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "std"))]
 mod exports;
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "std"))]
 mod imports;
-#[cfg(target_arch = "wasm32")]
 mod memory; // Used by exports and imports only. This assumes pointers are 32 bit long, which makes it untestable on dev machines.
 
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "std"))]
 pub use crate::exports::{do_execute, do_instantiate, do_migrate, do_query, do_reply, do_sudo};
-#[cfg(all(feature = "stargate", target_arch = "wasm32"))]
+#[cfg(all(feature = "stargate", target_arch = "wasm32", feature = "std"))]
 pub use crate::exports::{
     do_ibc_channel_close, do_ibc_channel_connect, do_ibc_channel_open, do_ibc_packet_ack,
     do_ibc_packet_receive, do_ibc_packet_timeout,
 };
-#[cfg(target_arch = "wasm32")]
+#[cfg(all(target_arch = "wasm32", feature = "std"))]
 pub use crate::imports::{ExternalApi, ExternalQuerier, ExternalStorage};
 
+pub use memory::Region;
+
 // Exposed for testing only
 // Both unit tests and integration tests are compiled to native code, so everything in here does not need to compile to Wasm.
 #[cfg(not(target_arch = "wasm32"))]

packages/std/src/memory.rs

@@ -1,3 +1,5 @@
+#![allow(unused)]
+
 use alloc::boxed::Box;
 use alloc::vec::Vec;
 use core::mem;