diff --git a/.dprintrc.json b/.dprintrc.json deleted file mode 100644 index c268f318..00000000 --- a/.dprintrc.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://dprint.dev/schemas/v0.json", - "projectType": "openSource", - "incremental": true, - "markdown": { - }, - "includes": ["**/*.{md}"], - "excludes": [ - - ], - "plugins": [ - "https://plugins.dprint.dev/markdown-0.6.1.wasm" - ] -} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13d9ffdf..e0ae31f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,22 +16,11 @@ jobs: uses: actions/checkout@v2 - uses: Swatinem/rust-cache@v1.2.0 - id: cache - - - name: Install tomlfmt - if: steps.cache.outputs.cache-hit != 'true' - run: cargo install cargo-tomlfmt - - - name: Check Cargo.toml formatting - run: | - cargo tomlfmt -d -p Cargo.toml - cargo tomlfmt -d -p monero-harness/Cargo.toml - cargo tomlfmt -d -p swap/Cargo.toml - name: Check code formatting run: cargo fmt --all -- --check - - name: Check markdown formatting + - name: Check formatting uses: dprint/check@v1.3 - name: Run clippy with default features diff --git a/Cargo.toml b/Cargo.toml index ed293ea0..7317bafa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["monero-harness", "monero-rpc", "swap"] +members = [ "monero-harness", "monero-rpc", "swap" ] [patch.crates-io] -torut = { git = "https://github.com/bonomat/torut/", branch = "feature-flag-tor-secret-keys", default-features = false, features = ["v3", "control"] } +torut = { git = "https://github.com/bonomat/torut/", branch = "feature-flag-tor-secret-keys", default-features = false, features = [ "v3", "control" ] } diff --git a/dprint.json b/dprint.json new file mode 100644 index 00000000..a40fdc06 --- /dev/null +++ b/dprint.json @@ -0,0 +1,15 @@ +{ + "$schema": "https://dprint.dev/schemas/v0.json", + "projectType": "openSource", + "incremental": true, + "markdown": { + }, + "includes": ["**/*.{md}", "**/*.{toml}"], + "excludes": [ + "./tokio-tar/Cargo.toml" + ], + "plugins": [ + "https://plugins.dprint.dev/markdown-0.6.1.wasm", + "https://github.com/thomaseizinger/dprint-plugin-cargo-toml/releases/download/0.1.0/cargo-toml-0.1.0.wasm" + ] +} diff --git a/monero-harness/Cargo.toml b/monero-harness/Cargo.toml index 0b090d0c..2a494567 100644 --- a/monero-harness/Cargo.toml +++ b/monero-harness/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "monero-harness" version = "0.1.0" -authors = ["CoBloX Team "] +authors = [ "CoBloX Team " ] edition = "2018" [dependencies] @@ -11,6 +11,6 @@ monero-rpc = { path = "../monero-rpc" } rand = "0.7" spectral = "0.6" testcontainers = "0.12" -tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "time", "macros"] } +tokio = { version = "1", default-features = false, features = [ "rt-multi-thread", "time", "macros" ] } tracing = "0.1" -tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter", "tracing-log"] } +tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "tracing-log" ] } diff --git a/monero-rpc/Cargo.toml b/monero-rpc/Cargo.toml index 8f1b68ed..78d2d2e3 100644 --- a/monero-rpc/Cargo.toml +++ b/monero-rpc/Cargo.toml @@ -1,14 +1,14 @@ [package] name = "monero-rpc" version = "0.1.0" -authors = ["CoBloX Team "] +authors = [ "CoBloX Team " ] edition = "2018" [dependencies] anyhow = "1" -reqwest = { version = "0.11", default-features = false, features = ["json"] } -serde = { version = "1.0", features = ["derive"] } +jsonrpc_client = { version = "0.6", features = [ "reqwest" ] } +monero = "0.11" +reqwest = { version = "0.11", default-features = false, features = [ "json" ] } +serde = { version = "1.0", features = [ "derive" ] } serde_json = "1.0" tracing = "0.1" -jsonrpc_client = { version = "0.6", features = ["reqwest"] } -monero = "0.11" diff --git a/swap/Cargo.toml b/swap/Cargo.toml index b2045724..fbcefff4 100644 --- a/swap/Cargo.toml +++ b/swap/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "swap" version = "0.5.0" -authors = ["The COMIT guys "] +authors = [ "The COMIT guys " ] edition = "2018" description = "XMR/BTC trustless atomic swaps." @@ -10,58 +10,58 @@ name = "swap" [dependencies] anyhow = "1" -async-compression = { version = "0.3", features = ["bzip2", "tokio"] } +async-compression = { version = "0.3", features = [ "bzip2", "tokio" ] } async-trait = "0.1" atty = "0.2" -backoff = { version = "0.3", features = ["tokio"] } +backoff = { version = "0.3", features = [ "tokio" ] } base64 = "0.13" bdk = "0.6" big-bytes = "1" -bitcoin = { version = "0.26", features = ["rand", "use-serde"] } +bitcoin = { version = "0.26", features = [ "rand", "use-serde" ] } bmrng = "0.5" -config = { version = "0.11", default-features = false, features = ["toml"] } +config = { version = "0.11", default-features = false, features = [ "toml" ] } conquer-once = "0.3" curve25519-dalek = "3" data-encoding = "2.3" dialoguer = "0.8" directories-next = "2" -ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["libsecp_compat", "serde"] } +ecdsa_fun = { git = "https://github.com/LLFourn/secp256kfun", features = [ "libsecp_compat", "serde" ] } ed25519-dalek = "1" futures = { version = "0.3", default-features = false } itertools = "0.10" -libp2p = { version = "0.37", default-features = false, features = ["tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response", "websocket"] } +libp2p = { version = "0.37", default-features = false, features = [ "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "request-response", "websocket" ] } libp2p-async-await = { git = "https://github.com/comit-network/rust-libp2p-async-await" } -miniscript = { version = "5", features = ["serde"] } -monero = { version = "0.11", features = ["serde_support"] } +miniscript = { version = "5", features = [ "serde" ] } +monero = { version = "0.11", features = [ "serde_support" ] } monero-rpc = { path = "../monero-rpc" } pem = "0.8" prettytable-rs = "0.8" rand = "0.7" rand_chacha = "0.2" -reqwest = { version = "0.11", features = ["rustls-tls", "stream", "socks"], default-features = false } +reqwest = { version = "0.11", features = [ "rustls-tls", "stream", "socks" ], default-features = false } rust_decimal = "1" -serde = { version = "1", features = ["derive"] } +serde = { version = "1", features = [ "derive" ] } serde_cbor = "0.11" serde_json = "1" sha2 = "0.9" -sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", features = ["ed25519", "serde"] } +sigma_fun = { git = "https://github.com/LLFourn/secp256kfun", features = [ "ed25519", "serde" ] } sled = "0.34" structopt = "0.3" -strum = { version = "0.20", features = ["derive"] } +strum = { version = "0.20", features = [ "derive" ] } thiserror = "1" time = "0.2" -tokio = { version = "1", features = ["rt-multi-thread", "time", "macros", "sync", "process", "fs", "net"] } +tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net" ] } tokio-socks = "0.5" tokio-tungstenite = { version = "0.14", features = [ "rustls-tls" ] } -tokio-util = { version = "0.6", features = ["io"] } +tokio-util = { version = "0.6", features = [ "io" ] } toml = "0.5" -torut = { version = "0.1", default-features = false, features = ["v3", "control"] } -tracing = { version = "0.1", features = ["attributes"] } +torut = { version = "0.1", default-features = false, features = [ "v3", "control" ] } +tracing = { version = "0.1", features = [ "attributes" ] } tracing-appender = "0.1" -tracing-futures = { version = "0.2", features = ["std-future", "futures-03"] } -tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "ansi", "env-filter", "chrono", "tracing-log"] } -url = { version = "2", features = ["serde"] } -uuid = { version = "0.8", features = ["serde", "v4"] } +tracing-futures = { version = "0.2", features = [ "std-future", "futures-03" ] } +tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "chrono", "tracing-log" ] } +url = { version = "2", features = [ "serde" ] } +uuid = { version = "0.8", features = [ "serde", "v4" ] } void = "1" [target.'cfg(not(windows))'.dependencies]