Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Minor Cleanup and Version Bump #107

Merged
merged 2 commits into from
Dec 11, 2024
Merged

[Chore] Minor Cleanup and Version Bump #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9450eb0
minor cleanup and bump version
warittornc Dec 11, 2024
a5e55ea
cleanup workspace dependencies
warittornc Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
350 changes: 93 additions & 257 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ async-trait = "0.1.77"
chrono = "0.4.38"
derive_more = { version = "1.0.0-beta.6", features = ["full"] }
futures = "0.3.30"
futures-util = "0.3.31"
humantime-serde = "1.1.1"
itertools = "0.13.0"
mockito = "1.4.0"
Expand All @@ -42,10 +43,9 @@ rust_decimal = "1.10.2"
semver = "1.0.23"
serde = { version = "1.0.197", features = ["std", "derive", "alloc"] }
serde_json = "1.0.116"
thiserror = "1.0.57"
thiserror = "2.0.6"
tokio = { version = "1.36.0", features = ["full"] }
tokio-tungstenite = { version = "0.24.0", features = ["native-tls"] }
tokio-util = "0.7.10"
tonic = "0.12.1"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
Expand Down
4 changes: 1 addition & 3 deletions bothan-api/client/rust-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bothan-client"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
authors.workspace = true
edition.workspace = true
license.workspace = true
Expand All @@ -9,8 +9,6 @@ exclude.workspace = true

[dependencies]
prost = { workspace = true }
protoc-gen-prost = { workspace = true }
protoc-gen-tonic = { workspace = true }
tokio = { workspace = true }
tonic = { workspace = true }
reqwest = { workspace = true }
Expand Down
13 changes: 6 additions & 7 deletions bothan-api/server-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bothan-api-cli"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
rust-version = "1.81"
edition.workspace = true
license.workspace = true
Expand All @@ -11,6 +11,9 @@ name = "bothan"
path = "src/main.rs"

[dependencies]
bothan-client = { workspace = true }
bothan-core = { workspace = true }

bothan-api = { workspace = true }
bothan-binance = { workspace = true }
bothan-bybit = { workspace = true }
Expand All @@ -21,10 +24,7 @@ bothan-cryptocompare = { workspace = true }
bothan-htx = { workspace = true }
bothan-kraken = { workspace = true }
bothan-okx = { workspace = true }
bothan-client = { workspace = true }
bothan-core = { workspace = true }

async-trait = { workspace = true }
reqwest = { workspace = true }
semver = { workspace = true }
serde_json = { workspace = true }
Expand All @@ -33,9 +33,8 @@ tonic = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }

anyhow = "1.0.89"
clap = { version = "4.5.20", features = ["derive"] }
anyhow = "1.0.94"
clap = { version = "4.5.23", features = ["derive"] }
inquire = "0.7.5"
dirs = "5.0.1"
log = "0.4.22"
toml = "0.8.19"
2 changes: 1 addition & 1 deletion bothan-api/server-cli/config.example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ api_key = ""
# User agent string for HTTP requests to Coingecko.
user_agent = "Bothan"
# Update interval for pulling data from Coingecko.
update_interval = "1m"
update_interval = "30s"

# Configuration for CoinMarketCap.
[manager.crypto.source.coinmarketcap]
Expand Down
19 changes: 2 additions & 17 deletions bothan-api/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bothan-api"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand All @@ -18,27 +18,12 @@ bothan-htx = { workspace = true }
bothan-kraken = { workspace = true }
bothan-okx = { workspace = true }

anyhow = { workspace = true }
async-trait = { workspace = true }
chrono = { workspace = true }
humantime-serde = { workspace = true }
itertools = { workspace = true }
prost = { workspace = true }
protoc-gen-prost = { workspace = true }
protoc-gen-tonic = { workspace = true }
reqwest = { workspace = true }
rust_decimal = { workspace = true }
semver = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tonic = { workspace = true }
tracing = { workspace = true }

config = "0.14.0"
config = "0.14.1"
dirs = "5.0.1"
glob = "0.3.1"

[build-dependencies]
tonic-build = "0.12.3"
9 changes: 5 additions & 4 deletions bothan-binance/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[package]
name = "bothan-binance"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
async-trait = { workspace = true }
bothan-core = { workspace = true }
futures-util = { workspace = true, features = ["sink", "std"] }
humantime-serde = { workspace = true }
rand = { workspace = true }
rust_decimal = { workspace = true }
Expand All @@ -19,8 +20,8 @@ tokio-tungstenite = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }

futures-channel = "0.3.30"
futures-util = { version = "0.3.29", features = ["sink", "std"] }

[dev-dependencies]
ws-mock = { git = "https://github.com/bandprotocol/ws-mock.git", branch = "master" }

[package.metadata.cargo-machete]
ignored = ["humantime-serde"]
5 changes: 2 additions & 3 deletions bothan-bybit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
[package]
name = "bothan-bybit"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
futures-util = "0.3.29"

async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
futures-util = { workspace = true }
rust_decimal = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
6 changes: 2 additions & 4 deletions bothan-coinbase/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
[package]
name = "bothan-coinbase"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
futures-util = "0.3.29"

async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
rand = { workspace = true }
futures-util = { workspace = true }
rust_decimal = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
6 changes: 4 additions & 2 deletions bothan-coingecko/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bothan-coingecko"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand All @@ -11,7 +11,6 @@ repository.workspace = true
async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
futures = { workspace = true }
humantime-serde = { workspace = true }
reqwest = { workspace = true }
rust_decimal = { workspace = true }
Expand All @@ -25,3 +24,6 @@ url = { workspace = true }
[dev-dependencies]
mockito = { workspace = true }
serde_json = { workspace = true }

[package.metadata.cargo-machete]
ignored = ["humantime-serde"]
2 changes: 1 addition & 1 deletion bothan-coingecko/src/worker/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
use tokio::time::Duration;

pub(crate) const DEFAULT_UPDATE_INTERVAL: Duration = Duration::from_secs(60);
pub(crate) const DEFAULT_UPDATE_INTERVAL: Duration = Duration::from_secs(30);
7 changes: 5 additions & 2 deletions bothan-coinmarketcap/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bothan-coinmarketcap"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true
Expand All @@ -9,7 +9,6 @@ repository.workspace = true
async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
futures = { workspace = true }
humantime-serde = { workspace = true }
itertools = { workspace = true }
reqwest = { workspace = true }
Expand All @@ -24,3 +23,7 @@ url = { workspace = true }

[dev-dependencies]
mockito = { workspace = true }


[package.metadata.cargo-machete]
ignored = ["humantime-serde"]
18 changes: 4 additions & 14 deletions bothan-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "bothan-core"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
description = "Core library for Bothan"
authors.workspace = true
edition.workspace = true
Expand All @@ -10,31 +10,21 @@ repository.workspace = true
[dependencies]
async-trait = { workspace = true }
derive_more = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
semver = { workspace = true }
serde = { workspace = true, features = ["rc"] }
thiserror = { workspace = true }
tokio = { workspace = true }
tokio-util = { workspace = true }
tonic = { workspace = true }
tracing = { workspace = true }
reqwest = { workspace = true }
rust_decimal = { workspace = true, features = ["maths", "serde-str"] }

anyhow = "1.0.91"
bincode = "2.0.0-rc.3"
chrono = "0.4.38"
clap = { version = "4.5.20", features = ["derive"] }
chrono = "0.4.39"
ed25519 = "2.2.3"
ed25519-dalek = { version = "2.1.1", features = ["std", "rand_core"] }
hex = "0.4.3"
log = "0.4.22"
mini-moka = "0.10.3"
num-traits = "0.2.19"
petgraph = "0.6.4"
prost = "0.13.1"
rand = "0.8.5"
rust-rocksdb = "0.32.0"
serde_json = "1.0.132"
uuid = { version = "1.11.0", features = ["v4"] }
rust-rocksdb = "0.34.0"
serde_json = "1.0.133"
10 changes: 2 additions & 8 deletions bothan-cryptocompare/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
[package]
name = "bothan-cryptocompare"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
futures = { workspace = true }
humantime-serde = { workspace = true }
reqwest = { workspace = true }
futures-util = { workspace = true, features = ["sink", "std"] }
rust_decimal = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand All @@ -22,8 +19,5 @@ tracing = { workspace = true }
tracing-subscriber = { workspace = true }
url = { workspace = true }

futures-util = { version = "0.3.29", features = ["sink", "std"] }

[dev-dependencies]
mockito = { workspace = true }
serde_json = { workspace = true }
7 changes: 3 additions & 4 deletions bothan-htx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[package]
name = "bothan-htx"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
flate2 = "1.0.25"
futures-util = "0.3.29"
flate2 = "1.0.35"

async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
futures-util = { workspace = true }
rust_decimal = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
8 changes: 6 additions & 2 deletions bothan-kraken/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
[package]
name = "bothan-kraken"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
futures-util = "0.3.29"

async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
futures-util = { workspace = true }
humantime-serde = { workspace = true }
rust_decimal = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand All @@ -22,3 +23,6 @@ tracing-subscriber = { workspace = true }

[dev-dependencies]
ws-mock = { git = "https://github.com/bandprotocol/ws-mock.git", branch = "master" }

[package.metadata.cargo-machete]
ignored = ["humantime-serde"]
6 changes: 2 additions & 4 deletions bothan-okx/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
[package]
name = "bothan-okx"
version = "0.0.1-alpha.8"
version = "0.0.1-beta.1"
edition.workspace = true
license.workspace = true
repository.workspace = true

[dependencies]
futures-util = "0.3.29"

async-trait = { workspace = true }
bothan-core = { workspace = true }
chrono = { workspace = true }
rand = { workspace = true }
futures-util = { workspace = true }
rust_decimal = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down
Loading