From: Arik Sosman <git@arik.io>
Date: Thu, 1 Aug 2024 21:43:30 +0000 (-0700)
Subject: Undo relative path imports.
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2b2a8463c594bd7463eaccbc78b928073461a8ac;p=rust-lightning

Undo relative path imports.
---

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 29a7864c1..894638425 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -22,8 +22,7 @@ lightning = { path = "../lightning", features = ["regex", "hashbrown", "_test_ut
 lightning-invoice = { path = "../lightning-invoice" }
 lightning-rapid-gossip-sync = { path = "../lightning-rapid-gossip-sync" }
 bech32 = "0.9.1"
-#bitcoin = { version = "0.32.2", features = ["secp-lowmemory"] }
-bitcoin = { path = "../../../rust-bitcoin/bitcoin", features = ["secp-lowmemory"] }
+bitcoin = { version = "0.32.2", features = ["secp-lowmemory"] }
 hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 
 afl = { version = "0.12", optional = true }
diff --git a/lightning-background-processor/Cargo.toml b/lightning-background-processor/Cargo.toml
index aa2151a74..c780cc3d6 100644
--- a/lightning-background-processor/Cargo.toml
+++ b/lightning-background-processor/Cargo.toml
@@ -21,8 +21,7 @@ no-std = ["lightning/no-std", "lightning-rapid-gossip-sync/no-std"]
 default = ["std"]
 
 [dependencies]
-#bitcoin = { version = "0.32.2", default-features = false }
-bitcoin = { path = "../../../rust-bitcoin/bitcoin", default-features = false }
+bitcoin = { version = "0.32.2", default-features = false }
 lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false }
 lightning-rapid-gossip-sync = { version = "0.0.123-beta", path = "../lightning-rapid-gossip-sync", default-features = false }
 
diff --git a/lightning-block-sync/Cargo.toml b/lightning-block-sync/Cargo.toml
index 040edd346..c02084c16 100644
--- a/lightning-block-sync/Cargo.toml
+++ b/lightning-block-sync/Cargo.toml
@@ -18,8 +18,7 @@ rest-client = [ "serde_json", "chunked_transfer" ]
 rpc-client = [ "serde_json", "chunked_transfer" ]
 
 [dependencies]
-#bitcoin = "0.32.2"
-bitcoin = { path = "../../../rust-bitcoin/bitcoin" }
+bitcoin = "0.32.2"
 hex = { package = "hex-conservative", version = "0.1.1", default-features = false }
 lightning = { version = "0.0.123-beta", path = "../lightning" }
 tokio = { version = "1.35", features = [ "io-util", "net", "time", "rt" ], optional = true }
diff --git a/lightning-custom-message/Cargo.toml b/lightning-custom-message/Cargo.toml
index 2c429bfdd..d3c2e5708 100644
--- a/lightning-custom-message/Cargo.toml
+++ b/lightning-custom-message/Cargo.toml
@@ -14,8 +14,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-#bitcoin = "0.32.2"
-bitcoin = { path = "../../../rust-bitcoin/bitcoin" }
+bitcoin = "0.32.2"
 lightning = { version = "0.0.123-beta", path = "../lightning" }
 
 [lints]
diff --git a/lightning-invoice/Cargo.toml b/lightning-invoice/Cargo.toml
index 6cc13c822..e7b14d876 100644
--- a/lightning-invoice/Cargo.toml
+++ b/lightning-invoice/Cargo.toml
@@ -24,8 +24,7 @@ bech32 = { version = "0.9.1", default-features = false }
 lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false }
 secp256k1 = { version = "0.28.0", default-features = false, features = ["recovery", "alloc"] }
 serde = { version = "1.0.118", optional = true }
-#bitcoin = { version = "0.32.2", default-features = false }
-bitcoin = { path = "../../../rust-bitcoin/bitcoin", default-features = false }
+bitcoin = { version = "0.32.2", default-features = false }
 
 [dev-dependencies]
 lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false, features = ["_test_utils"] }
diff --git a/lightning-net-tokio/Cargo.toml b/lightning-net-tokio/Cargo.toml
index d2509613d..ede8cc0a7 100644
--- a/lightning-net-tokio/Cargo.toml
+++ b/lightning-net-tokio/Cargo.toml
@@ -15,8 +15,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-#bitcoin = "0.32.2"
-bitcoin = { path = "../../../rust-bitcoin/bitcoin" }
+bitcoin = "0.32.2"
 lightning = { version = "0.0.123-beta", path = "../lightning" }
 tokio = { version = "1.35", features = [ "rt", "sync", "net", "time" ] }
 
diff --git a/lightning-persister/Cargo.toml b/lightning-persister/Cargo.toml
index 351619ab6..e315fb791 100644
--- a/lightning-persister/Cargo.toml
+++ b/lightning-persister/Cargo.toml
@@ -14,8 +14,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-#bitcoin = "0.32.2"
-bitcoin = { path = "../../../rust-bitcoin/bitcoin" }
+bitcoin = "0.32.2"
 lightning = { version = "0.0.123-beta", path = "../lightning" }
 
 [target.'cfg(windows)'.dependencies]
@@ -26,8 +25,7 @@ criterion = { version = "0.4", optional = true, default-features = false }
 
 [dev-dependencies]
 lightning = { version = "0.0.123-beta", path = "../lightning", features = ["_test_utils"] }
-#bitcoin = { version = "0.32.2", default-features = false }
-bitcoin = { path = "../../../rust-bitcoin/bitcoin", default-features = false }
+bitcoin = { version = "0.32.2", default-features = false }
 
 [lints]
 workspace = true
diff --git a/lightning-rapid-gossip-sync/Cargo.toml b/lightning-rapid-gossip-sync/Cargo.toml
index 7a76d03c1..9d9f3d23e 100644
--- a/lightning-rapid-gossip-sync/Cargo.toml
+++ b/lightning-rapid-gossip-sync/Cargo.toml
@@ -16,8 +16,7 @@ std = ["lightning/std"]
 
 [dependencies]
 lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false }
-#bitcoin = { version = "0.32.2", default-features = false }
-bitcoin = { path = "../../../rust-bitcoin/bitcoin", default-features = false }
+bitcoin = { version = "0.32.2", default-features = false }
 
 [target.'cfg(ldk_bench)'.dependencies]
 criterion = { version = "0.4", optional = true, default-features = false }
diff --git a/lightning-transaction-sync/Cargo.toml b/lightning-transaction-sync/Cargo.toml
index e198e36d4..0243d7604 100644
--- a/lightning-transaction-sync/Cargo.toml
+++ b/lightning-transaction-sync/Cargo.toml
@@ -24,8 +24,7 @@ async-interface = []
 
 [dependencies]
 lightning = { version = "0.0.123-beta", path = "../lightning", default-features = false, features = ["std"] }
-#bitcoin = { version = "0.32.2", default-features = false }
-bitcoin = { path = "../../../rust-bitcoin/bitcoin", default-features = false }
+bitcoin = { version = "0.32.2", default-features = false }
 bdk-macros = "0.6"
 futures = { version = "0.3", optional = true }
 esplora-client = { version = "0.7", default-features = false, optional = true }
diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml
index 26213f4dc..b0d68fc10 100644
--- a/lightning/Cargo.toml
+++ b/lightning/Cargo.toml
@@ -42,7 +42,6 @@ default = ["std", "grind_signatures"]
 [dependencies]
 bech32 = { version = "0.9.1", default-features = false }
 bitcoin = { version = "0.32.2", default-features = false, features = ["secp-recovery"] }
-# bitcoin = { path = "../../../rust-bitcoin/bitcoin", default-features = false, features = ["secp-recovery"] }
 
 hashbrown = { version = "0.13", optional = true, default-features = false }
 possiblyrandom = { version = "0.2", optional = true, default-features = false }
@@ -58,7 +57,6 @@ regex = "1.5.6"
 
 [dev-dependencies.bitcoin]
 version = "0.32.2"
-# path = "../../../rust-bitcoin/bitcoin"
 default-features = false
 features = ["bitcoinconsensus", "secp-recovery"]