diff --git a/client/tests/integration/smartcontracts/Cargo.toml b/client/tests/integration/smartcontracts/Cargo.toml index 3e058bf4d77..955cbf646eb 100644 --- a/client/tests/integration/smartcontracts/Cargo.toml +++ b/client/tests/integration/smartcontracts/Cargo.toml @@ -53,5 +53,5 @@ serde_json = { version = "1.0.91", default-features = false } getrandom = { version = "0.2", features = ["custom"] } nonzero_ext = { version = "0.3.0", default-features = false } -lol_alloc = "0.4.0" +dlmalloc = { version = "0.2.6", features = ["global"] } panic-halt = "0.2.0" diff --git a/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/Cargo.toml b/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/Cargo.toml index dcb0c06e985..58f3433a861 100644 --- a/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/Cargo.toml +++ b/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/Cargo.toml @@ -14,5 +14,5 @@ crate-type = ['cdylib'] iroha_trigger.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/src/lib.rs b/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/src/lib.rs index 83fb83970b0..844e21d3d93 100644 --- a/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/src/lib.rs +++ b/client/tests/integration/smartcontracts/create_nft_for_every_user_trigger/src/lib.rs @@ -7,11 +7,11 @@ extern crate panic_halt; use alloc::{format, string::ToString}; +use dlmalloc::GlobalDlmalloc; use iroha_trigger::prelude::*; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_complex/Cargo.toml b/client/tests/integration/smartcontracts/executor_custom_instructions_complex/Cargo.toml index 08d487860ee..fc67ea62b04 100644 --- a/client/tests/integration/smartcontracts/executor_custom_instructions_complex/Cargo.toml +++ b/client/tests/integration/smartcontracts/executor_custom_instructions_complex/Cargo.toml @@ -19,5 +19,5 @@ serde_json.workspace = true serde.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_complex/src/lib.rs b/client/tests/integration/smartcontracts/executor_custom_instructions_complex/src/lib.rs index a5243ec66cc..142c3b735f6 100644 --- a/client/tests/integration/smartcontracts/executor_custom_instructions_complex/src/lib.rs +++ b/client/tests/integration/smartcontracts/executor_custom_instructions_complex/src/lib.rs @@ -10,6 +10,7 @@ extern crate alloc; #[cfg(not(test))] extern crate panic_halt; +use dlmalloc::GlobalDlmalloc; use executor_custom_data_model::complex_isi::{ ConditionalExpr, CoreExpr, CustomInstructionExpr, Evaluate, Value, }; @@ -17,10 +18,9 @@ use iroha_executor::{ data_model::{isi::CustomInstruction, query::QueryOutputBox}, prelude::*, }; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_simple/Cargo.toml b/client/tests/integration/smartcontracts/executor_custom_instructions_simple/Cargo.toml index acae74a475c..7dd316c7878 100644 --- a/client/tests/integration/smartcontracts/executor_custom_instructions_simple/Cargo.toml +++ b/client/tests/integration/smartcontracts/executor_custom_instructions_simple/Cargo.toml @@ -19,5 +19,5 @@ serde_json.workspace = true serde.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/executor_custom_instructions_simple/src/lib.rs b/client/tests/integration/smartcontracts/executor_custom_instructions_simple/src/lib.rs index 2a8f5364abc..17c2569ff59 100644 --- a/client/tests/integration/smartcontracts/executor_custom_instructions_simple/src/lib.rs +++ b/client/tests/integration/smartcontracts/executor_custom_instructions_simple/src/lib.rs @@ -8,12 +8,12 @@ extern crate alloc; #[cfg(not(test))] extern crate panic_halt; +use dlmalloc::GlobalDlmalloc; use executor_custom_data_model::simple_isi::{CustomInstructionBox, MintAssetForAllAccounts}; use iroha_executor::{data_model::isi::CustomInstruction, debug::DebugExpectExt, prelude::*}; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/executor_remove_permission/Cargo.toml b/client/tests/integration/smartcontracts/executor_remove_permission/Cargo.toml index 31ca77b6631..6c5a58306f4 100644 --- a/client/tests/integration/smartcontracts/executor_remove_permission/Cargo.toml +++ b/client/tests/integration/smartcontracts/executor_remove_permission/Cargo.toml @@ -21,5 +21,5 @@ serde_json.workspace = true serde.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/executor_remove_permission/src/lib.rs b/client/tests/integration/smartcontracts/executor_remove_permission/src/lib.rs index d5f6ba88a7a..d93b76c2ceb 100644 --- a/client/tests/integration/smartcontracts/executor_remove_permission/src/lib.rs +++ b/client/tests/integration/smartcontracts/executor_remove_permission/src/lib.rs @@ -6,12 +6,12 @@ #[cfg(not(test))] extern crate panic_halt; +use dlmalloc::GlobalDlmalloc; use iroha_executor::{prelude::*, DataModelBuilder}; use iroha_executor_data_model::permission::domain::CanUnregisterDomain; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/executor_with_admin/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_admin/Cargo.toml index 440bb0ac557..808cb9d5594 100644 --- a/client/tests/integration/smartcontracts/executor_with_admin/Cargo.toml +++ b/client/tests/integration/smartcontracts/executor_with_admin/Cargo.toml @@ -15,5 +15,5 @@ iroha_executor.workspace = true iroha_schema.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/executor_with_admin/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_admin/src/lib.rs index 246280635a1..d4466d1783a 100644 --- a/client/tests/integration/smartcontracts/executor_with_admin/src/lib.rs +++ b/client/tests/integration/smartcontracts/executor_with_admin/src/lib.rs @@ -6,11 +6,11 @@ #[cfg(not(test))] extern crate panic_halt; +use dlmalloc::GlobalDlmalloc; use iroha_executor::prelude::*; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/executor_with_custom_parameter/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_custom_parameter/Cargo.toml index 376354bb16b..4fc114974f1 100644 --- a/client/tests/integration/smartcontracts/executor_with_custom_parameter/Cargo.toml +++ b/client/tests/integration/smartcontracts/executor_with_custom_parameter/Cargo.toml @@ -22,5 +22,5 @@ serde_json.workspace = true serde.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/executor_with_custom_parameter/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_custom_parameter/src/lib.rs index 034747f5d9f..78aa0d5c1de 100644 --- a/client/tests/integration/smartcontracts/executor_with_custom_parameter/src/lib.rs +++ b/client/tests/integration/smartcontracts/executor_with_custom_parameter/src/lib.rs @@ -7,13 +7,13 @@ extern crate panic_halt; use alloc::format; +use dlmalloc::GlobalDlmalloc; use executor_custom_data_model::parameters::DomainLimits; use iroha_executor::{prelude::*, DataModelBuilder}; use iroha_executor_data_model::parameter::Parameter; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/executor_with_custom_permission/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_custom_permission/Cargo.toml index f4ce6650c77..32cf35963c6 100644 --- a/client/tests/integration/smartcontracts/executor_with_custom_permission/Cargo.toml +++ b/client/tests/integration/smartcontracts/executor_with_custom_permission/Cargo.toml @@ -22,5 +22,5 @@ serde_json.workspace = true serde.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/executor_with_custom_permission/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_custom_permission/src/lib.rs index 8f95b5f61d2..62774fa9fe8 100644 --- a/client/tests/integration/smartcontracts/executor_with_custom_permission/src/lib.rs +++ b/client/tests/integration/smartcontracts/executor_with_custom_permission/src/lib.rs @@ -16,15 +16,15 @@ extern crate alloc; #[cfg(not(test))] extern crate panic_halt; +use dlmalloc::GlobalDlmalloc; use executor_custom_data_model::permissions::CanControlDomainLives; use iroha_executor::{ data_model::prelude::*, permission::ExecutorPermision as _, prelude::*, DataModelBuilder, }; use iroha_executor_data_model::permission::domain::CanUnregisterDomain; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/executor_with_migration_fail/Cargo.toml b/client/tests/integration/smartcontracts/executor_with_migration_fail/Cargo.toml index bee72c68c99..b6326eed261 100644 --- a/client/tests/integration/smartcontracts/executor_with_migration_fail/Cargo.toml +++ b/client/tests/integration/smartcontracts/executor_with_migration_fail/Cargo.toml @@ -15,5 +15,5 @@ iroha_executor.workspace = true anyhow.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/executor_with_migration_fail/src/lib.rs b/client/tests/integration/smartcontracts/executor_with_migration_fail/src/lib.rs index 8cc6926c4b3..169a91e7882 100644 --- a/client/tests/integration/smartcontracts/executor_with_migration_fail/src/lib.rs +++ b/client/tests/integration/smartcontracts/executor_with_migration_fail/src/lib.rs @@ -6,11 +6,11 @@ extern crate alloc; #[cfg(not(test))] extern crate panic_halt; +use dlmalloc::GlobalDlmalloc; use iroha_executor::{debug::dbg_panic, prelude::*}; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger/Cargo.toml b/client/tests/integration/smartcontracts/mint_rose_trigger/Cargo.toml index 3c7447833a0..2a8bc1163f0 100644 --- a/client/tests/integration/smartcontracts/mint_rose_trigger/Cargo.toml +++ b/client/tests/integration/smartcontracts/mint_rose_trigger/Cargo.toml @@ -14,5 +14,5 @@ crate-type = ['cdylib'] iroha_trigger.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger/src/lib.rs b/client/tests/integration/smartcontracts/mint_rose_trigger/src/lib.rs index c4cd864b96f..9144a4e25ec 100644 --- a/client/tests/integration/smartcontracts/mint_rose_trigger/src/lib.rs +++ b/client/tests/integration/smartcontracts/mint_rose_trigger/src/lib.rs @@ -7,11 +7,11 @@ extern crate panic_halt; use core::str::FromStr as _; +use dlmalloc::GlobalDlmalloc; use iroha_trigger::prelude::*; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger_args/Cargo.toml b/client/tests/integration/smartcontracts/mint_rose_trigger_args/Cargo.toml index 19715ff3417..9fe349eac28 100644 --- a/client/tests/integration/smartcontracts/mint_rose_trigger_args/Cargo.toml +++ b/client/tests/integration/smartcontracts/mint_rose_trigger_args/Cargo.toml @@ -15,7 +15,7 @@ iroha_trigger.workspace = true executor_custom_data_model.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/client/tests/integration/smartcontracts/mint_rose_trigger_args/src/lib.rs b/client/tests/integration/smartcontracts/mint_rose_trigger_args/src/lib.rs index 41a35db8a6b..38f6374fa88 100644 --- a/client/tests/integration/smartcontracts/mint_rose_trigger_args/src/lib.rs +++ b/client/tests/integration/smartcontracts/mint_rose_trigger_args/src/lib.rs @@ -7,12 +7,12 @@ extern crate panic_halt; use core::str::FromStr as _; +use dlmalloc::GlobalDlmalloc; use executor_custom_data_model::mint_rose_args::MintRoseArgs; use iroha_trigger::{debug::dbg_panic, prelude::*}; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/multisig/Cargo.toml b/client/tests/integration/smartcontracts/multisig/Cargo.toml index 3c4c6db935b..c9d2e0ce879 100644 --- a/client/tests/integration/smartcontracts/multisig/Cargo.toml +++ b/client/tests/integration/smartcontracts/multisig/Cargo.toml @@ -15,7 +15,7 @@ iroha_trigger.workspace = true executor_custom_data_model.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/client/tests/integration/smartcontracts/multisig/src/lib.rs b/client/tests/integration/smartcontracts/multisig/src/lib.rs index f26a9af2c5a..8df495d344b 100644 --- a/client/tests/integration/smartcontracts/multisig/src/lib.rs +++ b/client/tests/integration/smartcontracts/multisig/src/lib.rs @@ -8,12 +8,12 @@ extern crate panic_halt; use alloc::{collections::btree_set::BTreeSet, format, vec::Vec}; +use dlmalloc::GlobalDlmalloc; use executor_custom_data_model::multisig::MultisigArgs; use iroha_trigger::{debug::dbg_panic, prelude::*}; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/multisig_register/Cargo.toml b/client/tests/integration/smartcontracts/multisig_register/Cargo.toml index 09d62f6c25e..02fed833dd4 100644 --- a/client/tests/integration/smartcontracts/multisig_register/Cargo.toml +++ b/client/tests/integration/smartcontracts/multisig_register/Cargo.toml @@ -16,7 +16,7 @@ iroha_executor_data_model.workspace = true executor_custom_data_model.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true serde = { workspace = true, features = ["derive"] } diff --git a/client/tests/integration/smartcontracts/multisig_register/src/lib.rs b/client/tests/integration/smartcontracts/multisig_register/src/lib.rs index f3f2dfb6530..e1f1a7c0488 100644 --- a/client/tests/integration/smartcontracts/multisig_register/src/lib.rs +++ b/client/tests/integration/smartcontracts/multisig_register/src/lib.rs @@ -8,13 +8,13 @@ extern crate panic_halt; use alloc::format; +use dlmalloc::GlobalDlmalloc; use executor_custom_data_model::multisig::MultisigRegisterArgs; use iroha_executor_data_model::permission::trigger::CanExecuteUserTrigger; use iroha_trigger::{debug::dbg_panic, prelude::*}; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_trigger::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/query_assets_and_save_cursor/Cargo.toml b/client/tests/integration/smartcontracts/query_assets_and_save_cursor/Cargo.toml index 8c59c1ce8f1..41c9da685c8 100644 --- a/client/tests/integration/smartcontracts/query_assets_and_save_cursor/Cargo.toml +++ b/client/tests/integration/smartcontracts/query_assets_and_save_cursor/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ['cdylib'] iroha_smart_contract.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true parity-scale-codec.workspace = true nonzero_ext.workspace = true diff --git a/client/tests/integration/smartcontracts/query_assets_and_save_cursor/src/lib.rs b/client/tests/integration/smartcontracts/query_assets_and_save_cursor/src/lib.rs index ba8c1477420..cd8f87b4ee1 100644 --- a/client/tests/integration/smartcontracts/query_assets_and_save_cursor/src/lib.rs +++ b/client/tests/integration/smartcontracts/query_assets_and_save_cursor/src/lib.rs @@ -7,13 +7,13 @@ extern crate panic_halt; extern crate alloc; +use dlmalloc::GlobalDlmalloc; use iroha_smart_contract::{data_model::query::cursor::ForwardCursor, prelude::*}; -use lol_alloc::{FreeListAllocator, LockedAllocator}; use nonzero_ext::nonzero; use parity_scale_codec::{Decode, DecodeAll, Encode}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_smart_contract::stub_getrandom); diff --git a/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/Cargo.toml b/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/Cargo.toml index 8244730ed6d..33a478ddfad 100644 --- a/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/Cargo.toml +++ b/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ['cdylib'] iroha_smart_contract.workspace = true panic-halt.workspace = true -lol_alloc.workspace = true +dlmalloc.workspace = true getrandom.workspace = true parity-scale-codec.workspace = true nonzero_ext.workspace = true diff --git a/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/src/lib.rs b/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/src/lib.rs index 0e45690ca93..c8826e00cc2 100644 --- a/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/src/lib.rs +++ b/client/tests/integration/smartcontracts/smart_contract_can_filter_queries/src/lib.rs @@ -9,15 +9,15 @@ extern crate alloc; use alloc::{collections::BTreeSet, string::ToString, vec::Vec}; +use dlmalloc::GlobalDlmalloc; use iroha_smart_contract::{ data_model::query::predicate::{string::StringPredicate, value::QueryOutputPredicate}, prelude::*, QueryOutputCursor, }; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_smart_contract::stub_getrandom); diff --git a/configs/swarm/executor.wasm b/configs/swarm/executor.wasm index 7bff907546d..4cf05e9698e 100644 Binary files a/configs/swarm/executor.wasm and b/configs/swarm/executor.wasm differ diff --git a/default_executor/Cargo.toml b/default_executor/Cargo.toml index 9c83a1f69a1..dea6553b9f5 100644 --- a/default_executor/Cargo.toml +++ b/default_executor/Cargo.toml @@ -27,5 +27,5 @@ codegen-units = 1 # Further reduces binary size but increases compilation time iroha_executor = { version = "2.0.0-pre-rc.21", path = "../smart_contract/executor", features = ["debug"] } getrandom = { version = "0.2", features = ["custom"] } -lol_alloc = "0.4.0" +dlmalloc = { version = "0.2.6", features = ["global"] } panic-halt = "0.2.0" diff --git a/default_executor/src/lib.rs b/default_executor/src/lib.rs index 665e07696ea..9fc90729682 100644 --- a/default_executor/src/lib.rs +++ b/default_executor/src/lib.rs @@ -6,11 +6,11 @@ extern crate alloc; #[cfg(not(test))] extern crate panic_halt; +use dlmalloc::GlobalDlmalloc; use iroha_executor::{debug::dbg_panic, prelude::*, DataModelBuilder}; -use lol_alloc::{FreeListAllocator, LockedAllocator}; #[global_allocator] -static ALLOC: LockedAllocator = LockedAllocator::new(FreeListAllocator::new()); +static ALLOC: GlobalDlmalloc = GlobalDlmalloc; getrandom::register_custom_getrandom!(iroha_executor::stub_getrandom);