Attempt to make tests ignore fee state deploy while mainnet keeps the…

… feature
mrgnlabs · Oct 17, 2024 · babd8ed · babd8ed
1 parent af52497
commit babd8ed
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/programs/brick/Cargo.toml b/programs/brick/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "brick"
 
 [features]
 no-entrypoint = []
@@ -16,10 +15,9 @@ cpi = ["no-entrypoint"]
 default = []
 idl-build = ["anchor-lang/idl-build"]
 test = []
-
-[profile.release]
-overflow-checks = true
+ignore-fee-deploy = []
 
 [dependencies]
-solana-program.workspace = true
-anchor-lang.workspace = true
+# Remove workspace = true if already defined in the root Cargo.toml
+anchor-lang = { workspace = true }
+solana-program = { workspace = true }
diff --git a/programs/marginfi/Cargo.toml b/programs/marginfi/Cargo.toml
@@ -22,7 +22,7 @@ devnet = []
 mainnet-beta = []
 debug = []
 staging = []
-fee-deploy = []
+ignore-fee-deploy = []
 
 [dependencies]
 solana-program = { workspace = true }

diff --git a/programs/marginfi/src/instructions/marginfi_group/init_global_fee_state.rs b/programs/marginfi/src/instructions/marginfi_group/init_global_fee_state.rs
@@ -16,9 +16,9 @@ pub fn initialize_fee_state(
 ) -> Result<()> {
     let mut fee_state = ctx.accounts.fee_state.load_init()?;
     cfg_if::cfg_if! {
-        if #[cfg(all(feature = "mainnet-beta", feature = "fee-deploy"))] {
-            if ctx.accounts.payer.key != &pubkey!("3HGdGLrnK9DsnHi1mCrUMLGfQHcu6xUrXhMY14GYjqvM"){
-                panic!("The mrgn program multisig must sign on mainnet.")
+        if #[cfg(all(feature = "mainnet-beta", not(feature = "ignore-fee-deploy")))] {
+            if ctx.accounts.payer.key != &pubkey!("3HGdGLrnK9DsnHi1mCrUMLGfQHcu6xUrXhMY14GYjqvM") {
+                panic!("The mrgn program multisig must sign on mainnet.");
             }
         }
     }

diff --git a/programs/mocks/Cargo.toml b/programs/mocks/Cargo.toml
@@ -22,6 +22,7 @@ devnet = []
 mainnet-beta = []
 debug = []
 staging = []
+ignore-fee-deploy = []
 
 [dependencies]
 anchor-lang = { workspace = true }

diff --git a/programs/test_transfer_hook/Cargo.toml b/programs/test_transfer_hook/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 [features]
 idl-build = []
 no-entrypoint = []
+ignore-fee-deploy = []
 
 [lib]
 crate-type = ["cdylib", "lib"]

diff --git a/scripts/build-program.sh b/scripts/build-program.sh
@@ -21,6 +21,6 @@ else
     exit 1
 fi
 
-cmd="anchor build -p $program_lib_name -- $features"
+cmd="anchor build -p $program_lib_name -- $features ignore-fee-deploy"
 echo "Running: $cmd"
 eval "$cmd"
diff --git a/scripts/build-workspace.sh b/scripts/build-workspace.sh
@@ -2,6 +2,6 @@
 ROOT=$(git rev-parse --show-toplevel)
 cd $ROOT
 
-cmd="anchor build --no-idl"
+cmd="anchor build --no-idl -- --features ignore-fee-deploy"
 echo "Running: $cmd"
 eval "$cmd"