From: Matt Corallo <git@bluematt.me>
Date: Thu, 16 Apr 2020 21:04:42 +0000 (-0400)
Subject: Support building a cdylib and skip libbitcoinconsensus in wasm32
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=be45f67a985a4694f1debfe482284870945c033b;p=rust-lightning

Support building a cdylib and skip libbitcoinconsensus in wasm32

This, combined with
https://github.com/rust-bitcoin/rust-secp256k1/pull/208 should get
us building in wasm again, hopefully without any future
complications due to WASM's lack of standard stdlibc.
---

diff --git a/lightning/Cargo.toml b/lightning/Cargo.toml
index 341084fc3..a2487e49b 100644
--- a/lightning/Cargo.toml
+++ b/lightning/Cargo.toml
@@ -10,6 +10,9 @@ Does most of the hard work, without implying a specific runtime, requiring clien
 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.
 """
 
+[lib]
+crate-type = ["cdylib", "rlib"]
+
 [features]
 # Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks.
 non_bitcoin_chain_hash_routing = []
@@ -26,7 +29,13 @@ bitcoin = "0.21"
 bitcoin_hashes = "0.7"
 secp256k1 = "0.15"
 
-[dev-dependencies.bitcoin]
+# Building libbitcoinconsensus in wasm32 requires a stdlibc, which is...complicated
+# Instead, just skip the script verification runs in wasm test runs.
+# Note that due to a long-standing bug only recently fixed in an RFC on nightly, this
+# workaround requires building with cargo nightly -Z features=itarget. See
+# tracking issue https://github.com/rust-lang/cargo/issues/7914 and
+# https://github.com/rust-lang/cargo/issues/1197.
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies.bitcoin]
 version = "0.21"
 features = ["bitcoinconsensus"]
 
diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs
index 95358208e..e6b99b733 100644
--- a/lightning/src/ln/functional_test_utils.rs
+++ b/lightning/src/ln/functional_test_utils.rs
@@ -467,6 +467,7 @@ pub fn create_announced_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(nodes: &'a
 
 macro_rules! check_spends {
 	($tx: expr, $($spends_txn: expr),*) => {
+		#[cfg(not(target_arch = "wasm32"))]
 		{
 			$tx.verify(|out_point| {
 				$(