Skip to content

Commit

Permalink
Merge branch 'master' into feature/pull-tx-param-defaults-from-network
Browse files Browse the repository at this point in the history
  • Loading branch information
MujkicA authored Sep 27, 2023
2 parents ad6a8ff + 10e47bd commit 2cc337a
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 18 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ jobs:
install_fuel_core: true
- cargo_command: test
args: --doc --workspace
- cargo_command: machete
args: --skip-target-dir
- command: test_wasm
args:
- command: check_doc_anchors_valid
Expand Down Expand Up @@ -215,6 +217,10 @@ jobs:
if: ${{ matrix.cargo_command == 'nextest' }}
uses: taiki-e/install-action@nextest

- name: Install cargo-machete
if: ${{ matrix.cargo_command == 'machete' }}
uses: taiki-e/install-action@cargo-machete

- name: Cargo (workspace-level)
if: ${{ matrix.cargo_command && !matrix.package }}
run: cargo ${{ matrix.cargo_command }} ${{ matrix.args }}
Expand Down
4 changes: 0 additions & 4 deletions packages/fuels-accounts/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ description = "Fuel Rust SDK accounts."

[dependencies]
async-trait = { workspace = true, default-features = false }
bytes = { workspace = true, features = ["serde"] }
chrono = { workspace = true }
elliptic-curve = { workspace = true, default-features = false }
eth-keystore = { workspace = true }
Expand All @@ -23,10 +22,7 @@ fuel-types = { workspace = true, features = ["random"] }
fuel-vm = { workspace = true }
fuels-core = { workspace = true }
hex = { workspace = true, default-features = false, features = ["std"] }
itertools = { workspace = true }
rand = { workspace = true, default-features = false }
serde = { workspace = true, default-features = true, features = ["derive"] }
sha2 = { workspace = true, default-features = false }
tai64 = { workspace = true, features = ["serde"] }
thiserror = { workspace = true, default-features = false }
tokio = { workspace = true, features = ["full"] }
Expand Down
3 changes: 3 additions & 0 deletions packages/fuels-code-gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ quote = { workspace = true }
regex = { workspace = true }
serde_json = { workspace = true }
syn = { workspace = true }

[package.metadata.cargo-machete]
ignored = ["Inflector"]
3 changes: 0 additions & 3 deletions packages/fuels-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ bech32 = { workspace = true }
chrono = { workspace = true }
fuel-abi-types = { workspace = true }
fuel-asm = { workspace = true }
fuel-core = { workspace = true, default-features = false, optional = true }
fuel-core-chain-config = { workspace = true }
fuel-core-client = { workspace = true, optional = true }
fuel-crypto = { workspace = true }
Expand All @@ -24,8 +23,6 @@ fuel-vm = { workspace = true }
fuels-macros = { workspace = true }
hex = { workspace = true, features = ["std"] }
itertools = { workspace = true }
proc-macro2 = { workspace = true }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_json = { workspace = true, default-features = true }
sha2 = { workspace = true }
Expand Down
4 changes: 0 additions & 4 deletions packages/fuels-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@ description = "Fuel Rust SDK marcros to generate types from ABI."
proc-macro = true

[dependencies]
Inflector = { workspace = true }
fuel-abi-types = { workspace = true }
fuels-code-gen = { workspace = true }
itertools = { workspace = true }
proc-macro2 = { workspace = true }
quote = { workspace = true }
rand = { workspace = true }
regex = { workspace = true }
serde_json = { workspace = true }
syn = { workspace = true, features = ["extra-traits"] }

[dev-dependencies]
Expand Down
6 changes: 0 additions & 6 deletions packages/fuels-programs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,9 @@ fuel-tx = { workspace = true }
fuel-types = { workspace = true, features = ["default"] }
fuels-accounts = { workspace = true }
fuels-core = { workspace = true }
hex = { workspace = true, default-features = false, features = ["std"] }
itertools = { workspace = true }
proc-macro2 = { workspace = true }
rand = { workspace = true }
regex = { workspace = true }
serde = { workspace = true, default-features = false, features = ["derive"] }
serde_json = { workspace = true }
sha2 = { workspace = true }
thiserror = { workspace = true, default-features = false }
tokio = { workspace = true }

[dev-dependencies]
Expand Down
1 change: 0 additions & 1 deletion packages/fuels-test-helpers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ description = "Fuel Rust SDK test helpers."
fuel-core = { workspace = true, default-features = false, optional = true }
fuel-core-chain-config = { workspace = true }
fuel-core-client = { workspace = true }
fuel-core-types = { workspace = true }
fuel-tx = { workspace = true }
fuel-types = { workspace = true, features = ["random"] }
fuels-accounts = { workspace = true, optional = true }
Expand Down
1 change: 1 addition & 0 deletions packages/fuels/tests/providers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ async fn test_get_gas_used() -> Result<()> {
}

#[tokio::test]
#[ignore]
async fn testnet_hello_world() -> Result<()> {
// Note that this test might become flaky.
// This test depends on:
Expand Down

0 comments on commit 2cc337a

Please sign in to comment.