Skip to content

Commit f28b8c6

Browse files
author
Yeastplume
authored
Compilation fixes for master (#700)
* update to use grin master, cargo update * and remaining crates
1 parent 12a25f8 commit f28b8c6

File tree

8 files changed

+535
-661
lines changed

8 files changed

+535
-661
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ grin_wallet_util = { path = "./util", version = "5.2.0-beta.1" }
4848

4949
# For beta release
5050

51-
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
52-
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
53-
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
54-
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
51+
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
52+
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
53+
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
54+
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
5555

5656
# For bleeding edge
57-
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
58-
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
59-
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
60-
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
57+
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
58+
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
59+
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
60+
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
6161

6262
# For local testing
6363
# grin_core = { path = "../grin/core"}

‎api/Cargo.toml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
3636

3737
# For beta release
3838

39-
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
40-
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
41-
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
39+
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
40+
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
41+
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
4242

4343
# For bleeding edge
44-
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
45-
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
46-
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
44+
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
45+
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
46+
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
4747

4848
# For local testing
4949
# grin_core = { path = "../../grin/core"}

‎config/Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ grin_wallet_util = { path = "../util", version = "5.2.0-beta.1" }
2626

2727
# For beta release
2828

29-
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
30-
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
29+
#grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
30+
#grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
3131

3232
# For bleeding edge
33-
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
34-
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
33+
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
34+
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
3535

3636
# For local testing
3737
# grin_core = { path = "../../grin/core"}

‎controller/Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
4646

4747
# For beta release
4848

49-
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
50-
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
51-
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
52-
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
49+
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
50+
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
51+
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
52+
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
5353

5454
# For bleeding edge
55-
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
56-
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
57-
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
58-
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
55+
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
56+
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
57+
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
58+
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
5959

6060
# For local testing
6161
# grin_core = { path = "../../grin/core"}
@@ -76,10 +76,10 @@ remove_dir_all = "0.7"
7676

7777
# For beta release
7878

79-
grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
79+
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
8080

8181
# For bleeding edge
82-
# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
82+
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
8383

8484
# For local testing
8585
# grin_chain = { path = "../../grin/chain"}

‎impls/Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ grin_wallet_libwallet = { path = "../libwallet", version = "5.2.0-beta.1" }
5252

5353
# For beta release
5454

55-
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
56-
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
57-
grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
58-
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
59-
grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
60-
grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
55+
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
56+
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
57+
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
58+
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
59+
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
60+
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
6161

6262
# For bleeding edge
63-
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
64-
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
65-
# grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
66-
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
67-
# grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
68-
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
63+
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
64+
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
65+
grin_chain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
66+
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
67+
grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
68+
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
6969

7070
# For local testing
7171
# grin_core = { path = "../../grin/core"}

‎libwallet/Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ grin_wallet_config = { path = "../config", version = "5.2.0-beta.1" }
4848

4949
# For beta release
5050

51-
grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
52-
grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
53-
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
54-
grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
51+
# grin_core = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3"}
52+
# grin_keychain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
53+
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
54+
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
5555

5656
# For bleeding edge
57-
# grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
58-
# grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
59-
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
60-
# grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
57+
grin_core = { git = "https://github.com/mimblewimble/grin", branch = "master" }
58+
grin_keychain = { git = "https://github.com/mimblewimble/grin", branch = "master" }
59+
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
60+
grin_store = { git = "https://github.com/mimblewimble/grin", branch = "master" }
6161

6262
# For local testing
6363
# grin_core = { path = "../../grin/core"}

‎util/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ thiserror = "1"
2525

2626
# For beta release
2727

28-
grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
28+
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
2929

3030
# For bleeding edge
31-
# grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
31+
grin_util = { git = "https://github.com/mimblewimble/grin", branch = "master" }
3232

3333
# For local testing
3434

0 commit comments

Comments
 (0)