Skip to content
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

P 1277 Avoid depending on moonbeam/astar deps #3237

Merged
merged 4 commits into from
Jan 24, 2025
+24 −24
Merged

P 1277 Avoid depending on moonbeam/astar deps #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06a93cd
remove moonbeam/astar direct dependency.
Jan 24, 2025
483391a
Merge remote-tracking branch 'origin/dev' into p-1277-new-try
Jan 24, 2025
e2bead8
Merge remote-tracking branch 'origin/dev' into p-1277-new-try
BillyWooo Jan 24, 2025
e17a4eb
doesn't need `sudo` here
BillyWooo Jan 24, 2025
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ test-cargo-all-benchmarks:

.PHONY: test-ts-litentry ## Run litentry ts tests without clean-up
test-ts-litentry: launch-network-litentry
@cd parachain && ./scripts/run-ts-test.sh litentry
@trap "./scripts/clean-network.sh" EXIT; cd parachain && ./scripts/run-ts-test.sh litentry

.PHONY: test-ts-paseo ## Run paseo ts tests without clean-up
test-ts-paseo: launch-network-paseo
@cd parachain && ./scripts/run-ts-test.sh paseo
@trap "./scripts/clean-network.sh" EXIT; cd parachain && ./scripts/run-ts-test.sh paseo

# clean up
.PHONY: clean-network ## Clean up the network launched by 'launch-network'
Expand Down
26 changes: 13 additions & 13 deletions parachain/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-
cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407", default-features = false }

# evm-tracing, use the astar version to use "standard" substrate frame to avoid any conflicts
moonbeam-primitives-ext = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
moonbeam-rpc-debug = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0" }
moonbeam-rpc-primitives-debug = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
moonbeam-rpc-primitives-txpool = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
moonbeam-rpc-trace = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
moonbeam-rpc-txpool = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
moonbeam-evm-tracer = { git = "https://github.com/AstarNetwork/Astar", tag = "v5.45.0", default-features = false }
moonbeam-primitives-ext = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
moonbeam-rpc-debug = { git = "https://github.com/litentry/moonbeam-vendor-rpc" }
moonbeam-rpc-primitives-debug = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
moonbeam-rpc-primitives-txpool = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
moonbeam-rpc-trace = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
moonbeam-rpc-txpool = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }
moonbeam-evm-tracer = { git = "https://github.com/litentry/moonbeam-vendor-rpc", default-features = false }

# polkadot client
polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2407" }
Expand Down
4 changes: 2 additions & 2 deletions parachain/scripts/clean-network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ esac
ZOMBIENET_BIN=zombienet-${os}-${arch}
ZOMBIENET_PID=$(pidof $ZOMBIENET_BIN)

if [ -z $ZOMBIENET_PID ]; then
if [ -z "$ZOMBIENET_PID" ]; then
# the network might not be started with zombienet
killall polkadot || true
killall litentry-collator || true
else
kill -2 $ZOMBIENET_PID
fi

docker ps -q -f name=geth | xargs -r docker stop
docker ps -q -f name=geth | xargs -r docker stop

rm -rf "$LITENTRY_PARACHAIN_DIR"

Expand Down