Skip to content

Commit 26f19af

Browse files
committed
chore: switch ferment onto master branch
1 parent 16ade0a commit 26f19af

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

Cargo.lock

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dash/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ ed25519-dalek = { version = "2.1", features = ["rand_core"], optional = true }
7171
blake3 = "1.5"
7272
thiserror = "1"
7373
bls-signatures = { git = "https://github.com/dashpay/bls-signatures", branch = "develop" }
74-
ferment = { git = "https://github.com/dashpay/ferment", branch = "feat/lifetime-support", package = "ferment" }
75-
ferment-macro = { git = "https://github.com/dashpay/ferment", branch = "feat/lifetime-support", package = "ferment-macro" }
74+
ferment = { git = "https://github.com/dashpay/ferment", package = "ferment" }
75+
ferment-macro = { git = "https://github.com/dashpay/ferment", package = "ferment-macro" }
7676

7777
[dev-dependencies]
7878
serde_json = "1.0.96"

hashes/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ secp256k1 = { default-features = false, features = ["hashes"], version= "0.30.0"
3939

4040
rs-x11-hash = { version = "0.1.8", optional = true }
4141
bincode = { version= "2.0.0-rc.3", optional = true }
42-
ferment = { git = "https://github.com/dashpay/ferment", branch = "feat/lifetime-support", package = "ferment" }
43-
ferment-macro = { git = "https://github.com/dashpay/ferment", branch = "feat/lifetime-support", package = "ferment-macro" }
4442

4543
[dev-dependencies]
4644
serde_test = "1.0"

0 commit comments

Comments
 (0)