chore(iota-graphql-rpc,move-vm-profiler,iota-node): Allow `unexpected…

…_cfgs` and rework some macros (#4831) * chore(iota-graphql-rpc): Allow `unexpected_cfgs` * chore(move-vm-profiler,iota-node): Rework `gas_profiler_feature_enabled` to avoid compilation warnings * One more check for disabled --------- Co-authored-by: Thibault Martinez <[email protected]>
iotaledger · Jan 22, 2025 · da3fb8a · da3fb8a
1 parent d50a71b
commit da3fb8a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/crates/iota-graphql-rpc/src/data/pg.rs b/crates/iota-graphql-rpc/src/data/pg.rs
@@ -64,6 +64,7 @@ impl QueryExecutor for PgExecutor {
         let max_cost = self.limits.max_db_query_cost;
         let instant = Instant::now();
         let pool = self.inner.get_pool();
+        #[allow(unexpected_cfgs)]
         let result = run_query_async!(&pool, move |conn| txn(&mut PgConnection { max_cost, conn }));
         self.metrics
             .observe_db_data(instant.elapsed(), result.is_ok());
@@ -84,6 +85,7 @@ impl QueryExecutor for PgExecutor {
         let max_cost = self.limits.max_db_query_cost;
         let instant = Instant::now();
         let pool = self.inner.get_pool();
+        #[allow(unexpected_cfgs)]
         let result = run_query_repeatable_async!(&pool, move |conn| txn(&mut PgConnection {
             max_cost,
             conn

diff --git a/crates/iota-node/src/main.rs b/crates/iota-node/src/main.rs
@@ -46,7 +46,7 @@ fn main() {
     // figure out how to eliminate crashes in prod because of this.
     // ProtocolConfig::poison_get_for_min_version();
 
-    move_vm_profiler::gas_profiler_feature_enabled! {
+    if move_vm_profiler::is_gas_profiler_feature_enabled() {
         panic!("Cannot run the iota-node binary with gas-profiler feature enabled");
     }
 

diff --git a/crates/iota/src/client_commands.rs b/crates/iota/src/client_commands.rs
@@ -694,7 +694,7 @@ impl IotaClientCommands {
                 tx_digest,
                 profile_output,
             } => {
-                move_vm_profiler::gas_profiler_feature_disabled! {
+                if !move_vm_profiler::is_gas_profiler_feature_enabled() {
                     bail!(
                         "gas-profiler feature is not enabled, rebuild or reinstall with \
                          --features gas-profiler"

diff --git a/external-crates/move/crates/move-vm-profiler/src/lib.rs b/external-crates/move/crates/move-vm-profiler/src/lib.rs
@@ -356,9 +356,7 @@ macro_rules! profile_dump_file {
 #[macro_export]
 macro_rules! gas_profiler_feature_enabled {
     ($($tt:tt)*) => {
-        if cfg!(feature = "gas-profiler") {
-            $($tt)*
-        }
+        $($tt)*
     };
 }
 
@@ -372,9 +370,7 @@ macro_rules! gas_profiler_feature_enabled {
 #[macro_export]
 macro_rules! gas_profiler_feature_disabled {
     ($($tt:tt)*) => {
-        if !cfg!(feature = "gas-profiler") {
-            $($tt)*
-        }
+        $($tt)*
     };
 }
 
@@ -383,3 +379,14 @@ macro_rules! gas_profiler_feature_disabled {
 macro_rules! gas_profiler_feature_disabled {
     ( $( $tt:tt )* ) => {};
 }
+
+pub const fn is_gas_profiler_feature_enabled() -> bool {
+    #[cfg(feature = "gas-profiler")]
+    {
+        true
+    }
+    #[cfg(not(feature = "gas-profiler"))]
+    {
+        false
+    }
+}