Skip to content

fix: rebuild validator for manual integration test tasks #1009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thlorenz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: rebuild validator for manual integration test tasks #1009

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
063f973
fix: rebuild validator for ix tests/setups that use it
thlorenz Mar 2, 2026
b69dc91
fix: include Cargo manifests in validator rebuild deps
thlorenz Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 29 additions & 23 deletions test-integration/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,17 @@ COMMITTOR_PROGRAM_SO := $(ROOT_DEPLOY_DIR)/magicblock_committor_program.so

PROGRAMS_SO := $(FLEXI_COUNTER_SO) $(SCHEDULECOMMIT_SO) $(SCHEDULECOMMIT_SECURITY_SO) $(COMMITTOR_PROGRAM_SO)

VALIDATOR_DEBUG_BIN=$(CARGO_TARGET_DIR)/debug/magicblock-validator
VALIDATOR_SRC := $(shell find $(DIR).. -name '*.rs' -type f -o -name 'Cargo.toml' -o -name 'Cargo.lock')

list:
@cat Makefile | grep "^[a-z].*:" | sed 's/:.*//g'
list-programs:
@echo $(PROGRAMS_SO)

programs: $(PROGRAMS_SO)

test: $(PROGRAMS_SO)
test: $(PROGRAMS_SO) $(VALIDATOR_DEBUG_BIN)
@# Only prepare chainlink programs when running chainlink tests
@if [ -z "$(SKIP_CHAINLINK_PREP)" ] && ([ -z "$(RUN_TESTS)" ] || [ "$(RUN_TESTS)" = "chainlink" ]); then \
echo "Preparing chainlink programs (RUN_TESTS=$(RUN_TESTS))"; \
Expand All @@ -53,58 +56,58 @@ test: $(PROGRAMS_SO)
CARGO_TEST_THREADS=$${CARGO_TEST_THREADS:-1} RUST_BACKTRACE=1 RUST_LOG=$(RUST_LOG) cargo run --package test-runner --bin run-tests; \
fi

test-force-mb: $(PROGRAMS_SO)
test-force-mb: $(PROGRAMS_SO) $(VALIDATOR_DEBUG_BIN)
RUST_LOG=$(RUST_LOG) \
FORCE_MAGIC_BLOCK_VALIDATOR=1 \
cargo run --package test-runner --bin run-tests

test-schedulecommit:
test-schedulecommit: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=schedulecommit \
$(MAKE) test
setup-schedulecommit-devnet:
RUST_LOG_STYLE=none \
RUN_TESTS=schedulecommit \
SETUP_ONLY=devnet \
$(MAKE) test
setup-schedulecommit-ephem:
setup-schedulecommit-ephem: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=schedulecommit \
SETUP_ONLY=ephem \
$(MAKE) test
setup-schedulecommit-both:
setup-schedulecommit-both: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=schedulecommit \
SETUP_ONLY=both \
$(MAKE) test

test-chainlink:
test-chainlink: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=chainlink \
$(MAKE) test
setup-chainlink-devnet:
RUST_LOG_STYLE=none \
RUN_TESTS=chainlink \
SETUP_ONLY=devnet \
$(MAKE) test
test-cloning:
test-cloning: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=cloning \
$(MAKE) test
setup-cloning-devnet:
RUST_LOG_STYLE=none \
RUN_TESTS=cloning \
SETUP_ONLY=devnet \
$(MAKE) test
setup-cloning-ephem:
setup-cloning-ephem: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=cloning \
SETUP_ONLY=ephem \
$(MAKE) test
setup-cloning-both:
setup-cloning-both: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=cloning \
SETUP_ONLY=both \
$(MAKE) test

test-restore-ledger:
test-restore-ledger: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=restore_ledger \
$(MAKE) test
setup-restore-ledger-devnet:
Expand All @@ -113,26 +116,26 @@ setup-restore-ledger-devnet:
SETUP_ONLY=devnet \
$(MAKE) test

test-magicblock-api:
test-magicblock-api: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=magicblock_api \
$(MAKE) test
setup-magicblock-api-devnet:
RUST_LOG_STYLE=none \
RUN_TESTS=magicblock_api \
SETUP_ONLY=devnet \
$(MAKE) test
setup-magicblock-api-ephem:
setup-magicblock-api-ephem: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=magicblock_api \
SETUP_ONLY=ephem \
$(MAKE) test
setup-magicblock-api-both:
setup-magicblock-api-both: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=magicblock_api \
SETUP_ONLY=both \
$(MAKE) test

test-table-mania:
test-table-mania: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=table_mania \
$(MAKE) test
setup-table-mania-devnet:
Expand All @@ -141,7 +144,7 @@ setup-table-mania-devnet:
SETUP_ONLY=devnet \
$(MAKE) test

test-committor:
test-committor: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=committor \
$(MAKE) test
setup-committor-devnet:
Expand All @@ -150,26 +153,26 @@ setup-committor-devnet:
SETUP_ONLY=devnet \
$(MAKE) test

test-pubsub:
test-pubsub: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=pubsub \
$(MAKE) test
setup-pubsub-devnet:
RUST_LOG_STYLE=none \
RUN_TESTS=pubsub \
SETUP_ONLY=devnet \
$(MAKE) test
setup-pubsub-ephem:
setup-pubsub-ephem: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=pubsub \
SETUP_ONLY=ephem \
$(MAKE) test
setup-pubsub-both:
setup-pubsub-both: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=pubsub \
SETUP_ONLY=both \
$(MAKE) test

test-config:
test-config: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=config \
$(MAKE) test
setup-config-devnet:
Expand All @@ -178,26 +181,26 @@ setup-config-devnet:
SETUP_ONLY=devnet \
$(MAKE) test

test-schedule-intents:
test-schedule-intents: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=schedule_intents \
$(MAKE) test
setup-schedule-intents-devnet:
RUST_LOG_STYLE=none \
RUN_TESTS=schedule_intents \
SETUP_ONLY=devnet \
$(MAKE) test
setup-schedule-intents-ephem:
setup-schedule-intents-ephem: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=schedule_intents \
SETUP_ONLY=ephem \
$(MAKE) test
setup-schedule-intents-both:
setup-schedule-intents-both: $(VALIDATOR_DEBUG_BIN)
RUST_LOG_STYLE=none \
RUN_TESTS=schedule_intents \
SETUP_ONLY=both \
$(MAKE) test

test-task-scheduler:
test-task-scheduler: $(VALIDATOR_DEBUG_BIN)
RUN_TESTS=task-scheduler \
$(MAKE) test
setup-task-scheduler-devnet:
Expand All @@ -218,6 +221,9 @@ $(COMMITTOR_PROGRAM_SO): $(COMMITTOR_PROGRAM_SRC)
cargo build-sbf --manifest-path $(COMMITTOR_PROGRAM_DIR)/Cargo.toml \
--sbf-out-dir $(ROOT_DEPLOY_DIR)/

$(VALIDATOR_DEBUG_BIN): $(VALIDATOR_SRC)
cargo build --bin magicblock-validator --manifest-path $(DIR)/../Cargo.toml

deploy-flexi-counter: $(FLEXI_COUNTER_SO)
solana program deploy \
-u localhost \
Expand Down