Skip to content

Commit 88fef64

Browse files
committed
Use workspaces to separate crates
1 parent 2afd531 commit 88fef64

File tree

76 files changed

+46
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+46
-40
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ script:
1414
- RUSTFLAGS="-C link-dead-code" cargo build --verbose
1515
- rm -f target/debug/lightning-* # Make sure we drop old test binaries
1616
- RUSTFLAGS="-C link-dead-code" cargo test --verbose
17-
- if [ "$(rustup show | grep default | grep 1.34.2)" != "" ]; then cd fuzz && cargo test --verbose && ./travis-fuzz.sh; fi
18-
- if [ "$(rustup show | grep default | grep stable)" != "" ]; then cd net-tokio && cargo build --verbose && cd ..; fi
17+
- if [ "$(rustup show | grep default | grep 1.34.2)" != "" ]; then cd lightning/fuzz && cargo test --verbose && ./travis-fuzz.sh; fi
18+
- if [ "$(rustup show | grep default | grep stable)" != "" ]; then cd lightning-net-tokio && cargo build --verbose && cd ..; fi
1919
- if [ "$(rustup show | grep default | grep stable)" != "" ]; then
2020
wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
2121
tar xzf master.tar.gz &&

Cargo.toml

Lines changed: 5 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,6 @@
1-
[package]
2-
name = "lightning"
3-
version = "0.0.9"
4-
authors = ["Matt Corallo"]
5-
license = "Apache-2.0"
6-
repository = "https://github.com/rust-bitcoin/rust-lightning/"
7-
description = """
8-
A Bitcoin Lightning library in Rust.
9-
Does most of the hard work, without implying a specific runtime, requiring clients implement basic network logic, chain interactions and disk storage.
10-
Still missing tons of error-handling. See GitHub issues for suggested projects if you want to contribute. Don't have to bother telling you not to use this for anything serious, because you'd have to build a client around it to even try.
11-
"""
1+
[workspace]
122

13-
[features]
14-
# Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks.
15-
non_bitcoin_chain_hash_routing = []
16-
fuzztarget = ["secp256k1/fuzztarget", "bitcoin/fuzztarget", "bitcoin_hashes/fuzztarget"]
17-
# Unlog messages superior at targeted level.
18-
max_level_off = []
19-
max_level_error = []
20-
max_level_warn = []
21-
max_level_info = []
22-
max_level_debug = []
23-
24-
[dependencies]
25-
bitcoin = "0.20"
26-
bitcoin_hashes = "0.7"
27-
secp256k1 = "0.15"
28-
29-
[dev-dependencies.bitcoin]
30-
version = "0.20"
31-
features = ["bitcoinconsensus"]
32-
33-
[dev-dependencies]
34-
hex = "0.3"
35-
rand = "0.4"
36-
37-
[profile.dev]
38-
opt-level = 1
3+
members = [
4+
"lightning",
5+
"lightning-net-tokio",
6+
]

net-tokio/Cargo.toml renamed to lightning-net-tokio/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ For Rust-Lightning clients which wish to make direct connections to Lightning P2
1111
[dependencies]
1212
bitcoin = "0.20"
1313
bitcoin_hashes = "0.7"
14-
lightning = { version = "0.0.9", path = "../" }
14+
lightning = { version = "0.0.9", path = "../lightning" }
1515
secp256k1 = "0.15"
1616
tokio-codec = "0.1"
1717
futures = "0.1"
File renamed without changes.

lightning/Cargo.toml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
[package]
2+
name = "lightning"
3+
version = "0.0.9"
4+
authors = ["Matt Corallo"]
5+
license = "Apache-2.0"
6+
repository = "https://github.com/rust-bitcoin/rust-lightning/"
7+
description = """
8+
A Bitcoin Lightning library in Rust.
9+
Does most of the hard work, without implying a specific runtime, requiring clients implement basic network logic, chain interactions and disk storage.
10+
Still missing tons of error-handling. See GitHub issues for suggested projects if you want to contribute. Don't have to bother telling you not to use this for anything serious, because you'd have to build a client around it to even try.
11+
"""
12+
13+
[features]
14+
# Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks.
15+
non_bitcoin_chain_hash_routing = []
16+
fuzztarget = ["secp256k1/fuzztarget", "bitcoin/fuzztarget", "bitcoin_hashes/fuzztarget"]
17+
# Unlog messages superior at targeted level.
18+
max_level_off = []
19+
max_level_error = []
20+
max_level_warn = []
21+
max_level_info = []
22+
max_level_debug = []
23+
24+
[dependencies]
25+
bitcoin = "0.20"
26+
bitcoin_hashes = "0.7"
27+
secp256k1 = "0.15"
28+
29+
[dev-dependencies.bitcoin]
30+
version = "0.20"
31+
features = ["bitcoinconsensus"]
32+
33+
[dev-dependencies]
34+
hex = "0.3"
35+
rand = "0.4"
36+
37+
[profile.dev]
38+
opt-level = 1
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)