Fix features

.github/workflows/main.yml

@@ -46,12 +46,12 @@ jobs:
           toolchain: ${{ matrix.rust }}
           override: true
       - name: Running cargo test
-        env: 
-          FEATUERS: bitcoin elements
+        env:
+          FEATURES: bitcoin elements
         run: |
-          for f in $FEATURES; do [cargo test --no-default-features --features=f]; done
-          cargo test --no-default-features
-          cargo test --all-features
+          for f in $FEATURES; do echo "Features: $f" && cargo test --no-default-features --features="$f"; done
+          echo "No default features" && cargo test --no-default-features
+          echo "All features" && cargo test --all-features
 
   clippy:
     name: Clippy
@@ -95,16 +95,16 @@ jobs:
           toolchain: ${{ matrix.rust }}
           override: true
       - name: Running cargo test
-        env: 
-          FEATUERS: bitcoin elements
+        env:
+          FEATURES: honggfuzz_fuzz
         run: |
           cd fuzz/
-          for f in $FEATURES; do [cargo test --no-default-features --features=f]; done
-          cargo test --no-default-features
-          cargo test --all-features
+          for f in $FEATURES; do echo "Features: $f" && cargo test --no-default-features --features="$f"; done
+          echo "No default features" && cargo test --no-default-features
+          echo "All features" && cargo test --all-features
       - name: Running fuzz tests
-        env: 
-          FEATUERS: bitcoin elements
+        env:
+          FEATURES: honggfuzz_fuzz
         run: |
           cd fuzz/
           ./travis-fuzz.sh

src/extension/elements/data_structures.rs

@@ -195,7 +195,7 @@ impl SimplicityHash for confidential::Nonce {
     }
 }
 
-impl SimplicityHash for bitcoin::Script {
+impl SimplicityHash for elements::bitcoin::Script {
     /// All scripts are first hashed to sha256 to get a scriptpubkey
     /// equivalent and then added to current sha256 context.
     fn simplicity_hash(&self, eng: &mut sha256::HashEngine) {

src/extension/elements/jets.rs

@@ -763,8 +763,8 @@ mod tests {
     };
     use crate::merkle::cmr::Cmr;
     use crate::merkle::common::MerkleRoot;
-    use bitcoin::Script;
     use bitcoin_hashes::sha256;
+    use elements::bitcoin::Script;
     use elements::{
         confidential, AssetIssuance, OutPoint, Transaction, TxIn, TxInWitness, TxOut, TxOutWitness,
     };
@@ -833,7 +833,7 @@ mod tests {
             lock_time: 0,
             input: vec![TxIn {
                 previous_output: OutPoint {
-                    txid: bitcoin::Txid::from_inner(tx_id),
+                    txid: elements::bitcoin::Txid::from_inner(tx_id),
                     vout: 0,
                 },
                 sequence: 0xfffffffe,
@@ -898,8 +898,8 @@ mod tests {
         mac.exec(&program, &txenv).unwrap();
     }
     #[cfg(test)]
-    fn hex_script(s: &str) -> bitcoin::Script {
-        let v: Vec<u8> = bitcoin::hashes::hex::FromHex::from_hex(s).unwrap();
-        bitcoin::Script::from(v)
+    fn hex_script(s: &str) -> elements::bitcoin::Script {
+        let v: Vec<u8> = elements::bitcoin::hashes::hex::FromHex::from_hex(s).unwrap();
+        elements::bitcoin::Script::from(v)
     }
 }