Skip to content

Commit

Permalink
Remove old cargo-lock machinery for dep-trees
Browse files Browse the repository at this point in the history
  • Loading branch information
graydon committed Sep 8, 2024
1 parent b246a19 commit 4596ffa
Show file tree
Hide file tree
Showing 9 changed files with 405 additions and 1,231 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ compile_commands.json
/src/main/StellarCoreVersion.cpp
/src/main/XDRFilesSha256.cpp
/src/rust/soroban/tmp
/src/rust/src/dep-trees/*-actual.txt

/src/testdata/*
# Make an exception for ledger-close-meta files, which should be created and committed on every protocol bump.
Expand Down
152 changes: 0 additions & 152 deletions Cargo.lock

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

8 changes: 0 additions & 8 deletions src/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ rustc-simple-version = "=0.1.0"
# will complain if it does not match)
rand = "=0.8.5"

petgraph = "=0.6.4"
toml = "=0.7.8"
itertools = "=0.11.0"

# Stellar-core supports multiple versions of the Soroban host linked in
Expand Down Expand Up @@ -81,12 +79,6 @@ git = "https://github.com/stellar/rs-soroban-env"
rev = "5ed156b7fb5dd3e46635aa0f818d5db33dfd6b6a"
#path = "../../../rs-soroban-env/soroban-synth-wasm"

[dependencies.cargo-lock]
version = "=9.0.0"
git = "https://github.com/rustsec/rustsec"
rev = "a5c69fc6e4b6068b43d7143f3a2f68c3f3de37d8"
features = ["dependency-tree"]

[features]

tracy = ["dep:tracy-client"]
Expand Down
14 changes: 6 additions & 8 deletions src/rust/src/dep-trees/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
This directory contains explicit dependency trees for the different soroban
hosts linked into stellar-core. To add a new one, install cargo-lock and run
something like:

$ cargo lock tree --exact [email protected] > p22.txt
$ git add p22.txt

With whatever version you want to support in place of "22".
This directory contains expected dependency trees for the different soroban
hosts linked into stellar-core. During a build the makefile will extract
the actual dependency tree of the configured soroban-env-host from their
submodule lockfiles and compare them. If they differ you need to decide
how to fix it: either update the expectation, or roll back the change
in the submodule.
Loading

0 comments on commit 4596ffa

Please sign in to comment.