Fix more failing tests

Author: ebatsell

.github/workflows/ci.yaml

@@ -170,7 +170,7 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - run: cargo nextest run --all-features -E 'not test(ledger_utils::tests)'
         env:
-          SBF_OUT_DIR: ${{ github.workspace }}/integration_tests/tests/fixtures
+          SBPF_OUT_DIR: ${{ github.workspace }}/integration_tests/tests/fixtures
 
   # create_release:
   #   name: Create Release

README.md

@@ -6,7 +6,7 @@
 
 1. Set up test-ledger: `./tip-router-operator-cli/scripts/setup-test-ledger.sh`
 2. Build the tip router program: `cargo build-sbf --manifest-path program/Cargo.toml --sbf-out-dir integration_tests/tests/fixtures`
-3. Run tests: `SBF_OUT_DIR=integration_tests/tests/fixtures cargo test`
+3. Run tests: `SBPF_OUT_DIR=integration_tests/tests/fixtures cargo nextest run --all-features -E 'not test(ledger_utils::tests)'`
 
 To see more info on the Tip Router CLI check out the [CLI documentation](./cli/README.md)
 

format.sh

@@ -14,7 +14,7 @@ cargo fmt --all
 
 print_executing "cargo nextest run --all-features"
 cargo build-sbf --sbf-out-dir integration_tests/tests/fixtures
-SBF_OUT_DIR=integration_tests/tests/fixtures cargo nextest run --all-features -E 'not test(ledger_utils::tests::test_get_bank_from_ledger_success)'
+SBPF_OUT_DIR=integration_tests/tests/fixtures cargo nextest run --all-features -E 'not test(ledger_utils::tests::test_get_bank_from_ledger_success)'
 
 # Code coverage only runs with flag
 if [[ "$*" == *"--code-coverage"* ]]; then

integration_tests/tests/fixtures/jito_tip_distribution.so

@@ -18,7 +18,7 @@ To use this script, pipe the output of the test command to it.
 
 Examples:
     cargo nextest run --all-features -E 'not test(bpf)' |& ./pipe_test_output.sh
-    cargo build-sbf --sbf-out-dir integration_tests/tests/fixtures && SBF_OUT_DIR=integration_tests/tests/fixtures cargo nextest run  jito-tip-router-integration-tests::tests tip_router::simulation_tests::tests::simulation_test |& ./pipe_test_output.sh
+    cargo build-sbf --sbf-out-dir integration_tests/tests/fixtures && SBPF_OUT_DIR=integration_tests/tests/fixtures cargo nextest run  jito-tip-router-integration-tests::tests tip_router::simulation_tests::tests::simulation_test |& ./pipe_test_output.sh
 EOF
 }
 

pipe_test_output.sh

@@ -892,6 +892,10 @@ mod tests {
 
         let mut config_data: [u8; CONFIG_SIZE] = [0u8; CONFIG_SIZE];
         let mut config_cursor = std::io::Cursor::new(&mut config_data[..]);
+        // Write discriminator first
+        Config::DISCRIMINATOR
+            .serialize(&mut config_cursor)
+            .unwrap();
         config.serialize(&mut config_cursor).unwrap();
         config_account_data.set_data(config_data.to_vec());
         account_datas.push((config_pda.0, config_account_data));