Skip to content

Commit

Permalink
toml fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
kariy committed Aug 23, 2024
1 parent 1981ae3 commit c720325
Show file tree
Hide file tree
Showing 69 changed files with 432 additions and 435 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ members = [
"bin/scheduler",
"bin/sozo",
"bin/torii",
# "crates/benches",
"crates/dojo-utils",
# "crates/benches",
"crates/dojo-bindgen",
"crates/dojo-core",
"crates/dojo-lang",
"crates/dojo-test-utils",
"crates/dojo-types",
"crates/dojo-utils",
"crates/dojo-world",
"crates/dojo-world/abigen",
"crates/katana/controller",
Expand Down Expand Up @@ -172,7 +172,7 @@ pretty_assertions = "1.2.1"
rand = "0.8.5"
rayon = "1.8.0"
regex = "1.10.3"
reqwest = { version = "0.12", features = [ "blocking", "rustls-tls", "json" ], default-features = false }
reqwest = { version = "0.12", features = [ "blocking", "json", "rustls-tls" ], default-features = false }
rpassword = "7.2.0"
rstest = "0.18.2"
rstest_reuse = "0.6.0"
Expand Down
12 changes: 6 additions & 6 deletions bin/katana/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@ katana-core.workspace = true
katana-db.workspace = true
katana-node.workspace = true
katana-primitives.workspace = true
katana-rpc.workspace = true
katana-rpc-api.workspace = true
katana-rpc.workspace = true
katana-slot-controller = { workspace = true, optional = true }

alloy-primitives.workspace = true
anyhow.workspace = true
byte-unit = "5.1.4"
clap.workspace = true
clap_complete.workspace = true
dojo-utils.workspace = true
comfy-table = "7.1.1"
console.workspace = true
dojo-utils.workspace = true
serde_json.workspace = true
shellexpand = "3.1.0"
tokio.workspace = true
tracing.workspace = true
tracing-subscriber.workspace = true
tracing.workspace = true
url.workspace = true
comfy-table = "7.1.1"
byte-unit = "5.1.4"

[dev-dependencies]
assert_matches.workspace = true

[features]
default = [ "jemalloc", "messaging", "slot" ]

jemalloc = []
jemalloc = [ ]
messaging = [ "katana-node/messaging" ]
slot = [ "dep:katana-slot-controller", "katana-primitives/slot" ]
starknet-messaging = [ "katana-node/starknet-messaging" ]
4 changes: 2 additions & 2 deletions crates/dojo-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ version.workspace = true

[package.metadata.release]
pre-release-replacements = [
{ file = "Scarb.lock", search = "^name = \"dojo\"\nversion = \".*\"$", replace = "name = \"dojo\"\nversion = \"{{version}}\"", min = 1 },
{ file = "Scarb.toml", search = "^version = \".*\"$", replace = "version = \"{{version}}\"", min = 1 },
{ file = "Scarb.lock", search = "^name = \"dojo\"\nversion = \".*\"$", replace = "name = \"dojo\"\nversion = \"{{version}}\"", min = 1 },
{ file = "Scarb.toml", search = "^version = \".*\"$", replace = "version = \"{{version}}\"", min = 1 },
]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion crates/dojo-core/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
cairo-version = "2.7.0"
edition = "2024_07"
description = "The Dojo Core library for autonomous worlds."
edition = "2024_07"
name = "dojo"
version = "1.0.0-alpha.4"

Expand Down
4 changes: 2 additions & 2 deletions crates/dojo-lang/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ num-traits.workspace = true
once_cell.workspace = true
regex.workspace = true
salsa.workspace = true
scarb.workspace = true
scarb-ui.workspace = true
scarb.workspace = true
semver.workspace = true
serde.workspace = true
serde_json.workspace = true
serde_with.workspace = true
smol_str.workspace = true
starknet.workspace = true
starknet-crypto.workspace = true
starknet.workspace = true
thiserror.workspace = true
toml.workspace = true
tracing.workspace = true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
cairo-version = "2.7.0"
edition = "2024_07"
name = "compiler_cairo"
version = "0.1.0"
edition = "2024_07"
cairo-version = "2.7.0"

# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind = "Class"
abi = "manifests/dev/base/abis/dojo-base.json"
class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
kind = "Class"
manifest_name = "dojo-base"
original_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
abi = "manifests/dev/base/abis/dojo-base.json"
tag = "dojo-base"
manifest_name = "dojo-base"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind = "Class"
abi = "manifests/dev/base/abis/dojo-world.json"
class_hash = "0x3715f072aa1c07be724249fcda8b0322687f6c5c585eebc4402d162649c707c"
kind = "Class"
manifest_name = "dojo-world"
original_class_hash = "0x3715f072aa1c07be724249fcda8b0322687f6c5c585eebc4402d162649c707c"
abi = "manifests/dev/base/abis/dojo-world.json"
tag = "dojo-world"
manifest_name = "dojo-world"
4 changes: 2 additions & 2 deletions crates/dojo-test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ katana-primitives = { path = "../katana/primitives" }
katana-rpc = { path = "../katana/rpc/rpc" }
katana-rpc-api = { path = "../katana/rpc/rpc-api" }
katana-starknet = { package = "starknet", version = "=0.10.0" }
scarb.workspace = true
scarb-ui.workspace = true
scarb.workspace = true
serde.workspace = true
serde_json.workspace = true
serde_with.workspace = true
Expand All @@ -41,8 +41,8 @@ url.workspace = true
assert_fs.workspace = true
camino.workspace = true
dojo-lang = { path = "../dojo-lang" }
scarb.workspace = true
scarb-ui.workspace = true
scarb.workspace = true

[features]
build-examples = [ ]
4 changes: 2 additions & 2 deletions crates/dojo-types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ version.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cainome.workspace = true
crypto-bigint.workspace = true
hex.workspace = true
itertools.workspace = true
num-traits.workspace = true
serde.workspace = true
serde_json.workspace = true
starknet.workspace = true
strum.workspace = true
strum_macros.workspace = true
thiserror.workspace = true
serde_json.workspace = true
cainome.workspace = true
4 changes: 2 additions & 2 deletions crates/dojo-world/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ anyhow.workspace = true
async-trait.workspace = true
cairo-lang-filesystem.workspace = true
cairo-lang-project.workspace = true
cairo-lang-starknet.workspace = true
cairo-lang-starknet-classes.workspace = true
cairo-lang-starknet.workspace = true
camino.workspace = true
convert_case.workspace = true
dojo-utils = { workspace = true, optional = true }
Expand All @@ -22,8 +22,8 @@ serde.workspace = true
serde_json.workspace = true
serde_with.workspace = true
smol_str.workspace = true
starknet.workspace = true
starknet-crypto.workspace = true
starknet.workspace = true
thiserror.workspace = true
topological-sort.workspace = true
tracing.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions crates/dojo-world/abigen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
edition.workspace = true
name = "dojo-world-abigen"
version.workspace = true
edition.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cairo-lang-starknet-classes.workspace = true
cairo-lang-starknet.workspace = true
camino.workspace = true
scarb-ui.workspace = true
scarb.workspace = true
serde.workspace = true
serde_json.workspace = true
cairo-lang-starknet.workspace = true
cairo-lang-starknet-classes.workspace = true
6 changes: 3 additions & 3 deletions crates/katana/contracts/messaging/solidity/foundry.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[profile.default]
src = "src"
fs_permissions = [ { access = "read-write", path = "./logs" } ]
libs = [ "lib" ]
out = "out"
libs = ["lib"]
fs_permissions = [{ access = "read-write", path = "./logs"}]
src = "src"

# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
7 changes: 1 addition & 6 deletions crates/katana/executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ pprof = { version = "0.13.0", features = [ "criterion", "flamegraph" ] }
rayon.workspace = true

[features]
blockifier = [
"dep:blockifier",
"dep:katana-cairo",
"dep:parking_lot",
"dep:starknet",
]
blockifier = [ "dep:blockifier", "dep:katana-cairo", "dep:parking_lot", "dep:starknet" ]
default = [ "blockifier" ]

[[bench]]
Expand Down
2 changes: 1 addition & 1 deletion crates/katana/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ katana-executor.workspace = true
katana-pool.workspace = true
katana-primitives.workspace = true
katana-provider.workspace = true
katana-rpc.workspace = true
katana-rpc-api.workspace = true
katana-rpc.workspace = true

anyhow.workspace = true
dojo-metrics.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/katana/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ rand = { workspace = true, features = [ "small_rng" ] }
serde.workspace = true
serde_json.workspace = true
serde_with.workspace = true
starknet.workspace = true
starknet-crypto.workspace = true
starknet.workspace = true
strum_macros.workspace = true
thiserror.workspace = true

Expand Down
4 changes: 2 additions & 2 deletions crates/katana/rpc/rpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ katana-pool.workspace = true
katana-primitives.workspace = true
katana-provider.workspace = true
katana-rpc-api.workspace = true
katana-rpc-types.workspace = true
katana-rpc-types-builder.workspace = true
katana-rpc-types.workspace = true
katana-tasks.workspace = true
metrics.workspace = true
starknet.workspace = true
Expand All @@ -30,8 +30,8 @@ alloy-primitives = { workspace = true, features = [ "serde" ] }
assert_matches.workspace = true
cainome.workspace = true
dojo-test-utils.workspace = true
dojo-world.workspace = true
dojo-utils.workspace = true
dojo-world.workspace = true
jsonrpsee = { workspace = true, features = [ "client" ] }
katana-cairo.workspace = true
katana-node = { workspace = true, features = [ "messaging" ] }
Expand Down
4 changes: 2 additions & 2 deletions crates/katana/runner/runner-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
edition = "2021"
name = "runner-macro"
version = "1.0.0-alpha.7"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[lib]
proc-macro = true

[dependencies]
quote = "1.0.35"
syn = { version = "2.0.48", features = ["full", "fold"] }
syn = { version = "2.0.48", features = [ "fold", "full" ] }
2 changes: 1 addition & 1 deletion crates/katana/tasks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version.workspace = true
futures.workspace = true
rayon.workspace = true
thiserror.workspace = true
tokio.workspace = true
tokio-metrics = "0.3.1"
tokio-util = { version = "0.7.11", features = [ "rt" ] }
tokio.workspace = true
tracing.workspace = true
2 changes: 1 addition & 1 deletion crates/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ tokio.workspace = true
tracing.workspace = true

# Metrics
metrics.workspace = true
metrics-exporter-prometheus = "0.15.3"
metrics-process = "2.1.0"
metrics-util = "0.17.0"
metrics.workspace = true
reth-metrics-derive = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.0.3" }

[target.'cfg(not(windows))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/saya/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ cairo-proof-parser.workspace = true
dojo-utils.workspace = true
futures.workspace = true
itertools.workspace = true
once_cell.workspace = true
serde.workspace = true
serde_json.workspace = true
starknet-crypto.workspace = true
Expand All @@ -28,7 +29,6 @@ thiserror.workspace = true
tokio.workspace = true
tracing.workspace = true
url.workspace = true
once_cell.workspace = true
# TODO: use features for each possible DA.
celestia-rpc = "0.2.0"
celestia-types = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/torii/graphql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ warp.workspace = true
[dev-dependencies]
camino.workspace = true
dojo-test-utils = { path = "../../dojo-test-utils", features = [ "build-examples" ] }
dojo-world.workspace = true
dojo-utils.workspace = true
dojo-world.workspace = true
katana-runner.workspace = true
scarb.workspace = true
serial_test = "2.0.0"
Expand Down
4 changes: 2 additions & 2 deletions crates/torii/grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ strum.workspace = true
strum_macros.workspace = true

# server
dojo-world = { path = "../../dojo-world", features = [ "contracts" ] }
hex.workspace = true
hyper.workspace = true
rand.workspace = true
serde_json.workspace = true
tower.workspace = true
tracing.workspace = true
dojo-world = { path = "../../dojo-world", features = [ "contracts" ] }

[dev-dependencies]
cainome.workspace = true
camino.workspace = true
dojo-test-utils.workspace = true
dojo-utils.workspace = true
katana-runner.workspace = true
scarb.workspace = true
sozo-ops.workspace = true
katana-runner.workspace = true

[target.'cfg(target_arch = "wasm32")'.dependencies]
tonic-web-wasm-client.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/torii/types-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ version.workspace = true

[package.metadata.release]
pre-release-replacements = [
{ file = "Scarb.lock", search = "^name = \"dojo\"\nversion = \".*\"$", replace = "name = \"dojo\"\nversion = \"{{version}}\"", min = 1 },
{ file = "Scarb.toml", search = "^version = \".*\"$", replace = "version = \"{{version}}\"", min = 1 },
{ file = "Scarb.lock", search = "^name = \"dojo\"\nversion = \".*\"$", replace = "name = \"dojo\"\nversion = \"{{version}}\"", min = 1 },
{ file = "Scarb.toml", search = "^version = \".*\"$", replace = "version = \"{{version}}\"", min = 1 },
]

[lib]
Expand Down
4 changes: 2 additions & 2 deletions crates/torii/types-test/dojo_dev.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[world]
seed = "types_test"
name = "types test"
description = "Graphql types testing"
name = "types test"
seed = "types_test"
# icon_uri = "file://assets/icon.png"
# cover_uri = "file://assets/cover.png"
# website = "https://dojoengine.org"
Expand Down
7 changes: 2 additions & 5 deletions examples/game-lib/Scarb.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[workspace]
members = [
"armory",
"bestiary"
]
members = [ "armory", "bestiary" ]

[workspace.package]
version = "0.1.0"
description = "Example game library for Dojo"
version = "0.1.0"

[workspace.dependencies]
dojo = { path = "../../crates/dojo-core/" }
Loading

0 comments on commit c720325

Please sign in to comment.