Skip to content

Commit

Permalink
Merge pull request #75 from mlabs-haskell/szg251/conway
Browse files Browse the repository at this point in the history
Conway update
  • Loading branch information
szg251 authored Aug 27, 2024
2 parents 44aa529 + 1f21dd3 commit b5af06d
Show file tree
Hide file tree
Showing 44 changed files with 2,302 additions and 8,634 deletions.
1 change: 1 addition & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ extend-exclude = ["fourmolu.yaml"]
[default.extend-identifiers]
TypeLits = "TypeLits"
BA = "BA"
numer = "numer"
1 change: 1 addition & 0 deletions extras/tx-bakery-testsuite/tests/.envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake .#dev-tx-bakery-tests-rust
138 changes: 102 additions & 36 deletions extras/tx-bakery-testsuite/tests/Cargo.lock

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

7 changes: 3 additions & 4 deletions extras/tx-bakery-testsuite/tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ lbf-tx-bakery-tests-config-api = { path = ".extras/lbf-tx-bakery-tests-config-ap
lbf-tx-bakery-tests-plutus-api = { path = ".extras/lbf-tx-bakery-tests-plutus-api-0.1.0" }
lbr-prelude = { version = "0.1.1", features = ["derive"] }
lbf-prelude = { path = ".extras/lbf-prelude-0.1.0" }
plutus-ledger-api = { version = "0.2.1", features = ["lbf", "chrono"] }
tx-bakery = { version = "0.1.0", path = ".extras/tx-bakery-v0" }
plutus-ledger-api = { version = "1.0.0", features = ["lbf", "chrono"] }
tx-bakery = { version = "2.0.0-beta.1", path = ".extras/tx-bakery-v2" }
tokio = { version = "1.24.2", features = ["full"] }
chrono = "0.4.35"
num-bigint = { version = "0.4.4", features = ["serde"] }
url = "2.5.2"
assertables = "7.0.1"
tx-bakery-ogmios = { path = ".extras/tx-bakery-ogmios-v0" }
tx-bakery-plutip = { path = ".extras/tx-bakery-plutip-v0" }
tx-bakery-ogmios = { version = "2.0.0-beta.1", path = ".extras/tx-bakery-ogmios-v2" }
2 changes: 0 additions & 2 deletions extras/tx-bakery-testsuite/tests/build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
cargoNextestExtraArgs = "--no-capture";

testTools = [
inputs'.plutip.packages."plutip-core:exe:local-cluster"
inputs'.ogmios.packages."ogmios:exe:ogmios"
];

extraSources = [
config.packages.tx-bakery-rust-src
config.packages.tx-bakery-plutip-rust-src
config.packages.tx-bakery-ogmios-rust-src

# LB base schema and runtime libs
Expand Down
Loading

0 comments on commit b5af06d

Please sign in to comment.