Remove abort feature

CosmWasm · May 11, 2022 · 34b2b48 · 34b2b48
1 parent c1dd6c5
commit 34b2b48
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -218,15 +218,15 @@ jobs:
       - run:
           name: Build library for native target (all features)
           working_directory: ~/project/packages/std
-          command: cargo build --locked --features abort,iterator,staking,stargate
+          command: cargo build --locked --features iterator,staking,stargate
       - run:
           name: Build library for wasm target (all features)
           working_directory: ~/project/packages/std
-          command: cargo wasm --locked --features abort,iterator,staking,stargate
+          command: cargo wasm --locked --features iterator,staking,stargate
       - run:
           name: Run unit tests (all features)
           working_directory: ~/project/packages/std
-          command: cargo test --locked --features abort,iterator,staking,stargate
+          command: cargo test --locked --features iterator,staking,stargate
       - run:
           name: Build and run schema generator
           working_directory: ~/project/packages/std
@@ -945,7 +945,7 @@ jobs:
       - run:
           name: Clippy linting on std (all feature flags)
           working_directory: ~/project/packages/std
-          command: cargo clippy --all-targets --features abort,iterator,staking,stargate -- -D warnings
+          command: cargo clippy --all-targets --features iterator,staking,stargate -- -D warnings
       - run:
           name: Clippy linting on storage (no feature flags)
           working_directory: ~/project/packages/storage

diff --git a/devtools/check_workspace.sh b/devtools/check_workspace.sh
@@ -9,10 +9,10 @@ cargo fmt
 (
   cd packages/std
   cargo check
-  cargo check --features abort,iterator,staking,stargate
+  cargo check --features iterator,staking,stargate
   cargo wasm-debug
-  cargo wasm-debug --features abort,iterator,staking,stargate
-  cargo clippy --all-targets --features abort,iterator,staking,stargate -- -D warnings
+  cargo wasm-debug --features iterator,staking,stargate
+  cargo clippy --all-targets --features iterator,staking,stargate -- -D warnings
   cargo schema
 )
 (cd packages/storage && cargo build && cargo clippy --all-targets --features iterator -- -D warnings)

diff --git a/packages/std/src/exports.rs b/packages/std/src/exports.rs
@@ -28,10 +28,6 @@ use crate::serde::{from_slice, to_vec};
 use crate::types::Env;
 use crate::{CustomMsg, Deps, DepsMut, MessageInfo};
 
-#[cfg(feature = "abort")]
-#[no_mangle]
-extern "C" fn requires_abort() -> () {}
-
 #[cfg(feature = "iterator")]
 #[no_mangle]
 extern "C" fn requires_iterator() -> () {}

diff --git a/packages/vm/examples/check_contract.rs b/packages/vm/examples/check_contract.rs
@@ -6,7 +6,7 @@ use clap::{App, Arg};
 use cosmwasm_vm::features_from_csv;
 use cosmwasm_vm::internals::{check_wasm, compile};
 
-const DEFAULT_SUPPORTED_FEATURES: &str = "abort,iterator,staking,stargate";
+const DEFAULT_SUPPORTED_FEATURES: &str = "iterator,staking,stargate";
 
 pub fn main() {
     let matches = App::new("Contract checking")

diff --git a/packages/vm/examples/multi_threaded_cache.rs b/packages/vm/examples/multi_threaded_cache.rs
@@ -27,7 +27,7 @@ const THREADS: usize = SAVE_WASM_THREADS + INSTANTIATION_THREADS;
 pub fn main() {
     let options = CacheOptions {
         base_dir: TempDir::new().unwrap().into_path(),
-        supported_features: features_from_csv("abort,iterator,staking"),
+        supported_features: features_from_csv("iterator,staking"),
         memory_cache_size: MEMORY_CACHE_SIZE,
         instance_memory_limit: DEFAULT_MEMORY_LIMIT,
     };

diff --git a/packages/vm/src/cache.rs b/packages/vm/src/cache.rs
@@ -389,7 +389,7 @@ mod tests {
     static IBC_CONTRACT: &[u8] = include_bytes!("../testdata/ibc_reflect.wasm");
 
     fn default_features() -> HashSet<String> {
-        features_from_csv("abort,iterator,staking")
+        features_from_csv("iterator,staking")
     }
 
     fn make_testing_options() -> CacheOptions {

diff --git a/packages/vm/src/testing/instance.rs b/packages/vm/src/testing/instance.rs
@@ -95,7 +95,7 @@ pub struct MockInstanceOptions<'a> {
 impl MockInstanceOptions<'_> {
     fn default_features() -> HashSet<String> {
         #[allow(unused_mut)]
-        let mut out = features_from_csv("abort,iterator,staking");
+        let mut out = features_from_csv("iterator,staking");
         #[cfg(feature = "stargate")]
         out.insert("stargate".to_string());
         out