EPROD-1110 removed https endpoints for tests (#199)

.github/workflows/build-test.yml

@@ -1,4 +1,4 @@
-name: 'Build and Deploy'
+name: "Build and Deploy"
 
 on:
   workflow_call:
@@ -41,7 +41,7 @@ jobs:
 
       - name: Install dfx
         uses: dfinity/setup-dfx@main
-        with: 
+        with:
           dfx-version: "0.23.0"
 
       - name: Install Protobuf compiler
@@ -70,9 +70,6 @@ jobs:
           export RUST_BACKTRACE="full"
           sudo apt update
           sudo apt install -y gcc-multilib libunwind-dev ca-certificates
-          mkdir -p /usr/local/share/ca-certificates/
-          sudo cp btc-deploy/mkcert/* /usr/local/share/ca-certificates/
-          sudo update-ca-certificates --fresh --verbose
 
       - name: build solidity contracts
         run: |

btc-deploy/docker-compose.yml

@@ -61,10 +61,3 @@ services:
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: postgres
       POSTGRES_PORT: 5432
-
-  evm-rpc-canister-proxy:
-    image: ghcr.io/bitfinity-network/testing-local-ssl-proxy:latest
-    ports:
-      - "8002:8002"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"

docs/deploy.md

@@ -1,12 +1,12 @@
 # Deploy
 
 - [Deploy](#deploy)
-    - [Requirements](#requirements)
-        - [Ubuntu 24.04 additional dependencies](#ubuntu-2404-additional-dependencies)
-    - [Build](#build)
-    - [Local test EVM deployment](#local-test-evm-deployment)
-    - [Bridge deployment](#bridge-deployment)
-        - [Erc20 bridge](#erc20-bridge)
+  - [Requirements](#requirements)
+    - [Ubuntu 24.04 additional dependencies](#ubuntu-2404-additional-dependencies)
+  - [Build](#build)
+  - [Local test EVM deployment](#local-test-evm-deployment)
+  - [Bridge deployment](#bridge-deployment)
+    - [Erc20 bridge](#erc20-bridge)
 
 ## Requirements
 
@@ -23,23 +23,6 @@
     ```
 
 - Install [just](https://just.systems/) command runner.
-- Install SSL certificates to make the `local-ssl-proxy` in the docker images able to work.
-
-  On Debian-based systems it should be enough to run
-
-    ```sh
-    sudo cp btc-deploy/mkcert/* /usr/local/share/ca-certificates/
-    sudo update-ca-certificates --fresh --verbose
-    ```
-
-  On Arch linux based systems
-
-    ```sh
-    sudo trust anchor btc-deploy/mkcert/*
-    sudo update-ca-trust
-    ```
-
-  While on MacOS you should install them by clicking on the certificates in the mkcert folder.
 
 ### Ubuntu 24.04 additional dependencies
 

src/bridge-did/src/init/brc20.rs

@@ -62,9 +62,9 @@ impl Brc20BridgeConfig {
         if self
             .indexer_urls
             .iter()
-            .any(|url| !url.starts_with("https"))
+            .any(|url| !url.starts_with("https") && !url.starts_with("http://localhost"))
         {
-            return Err("Indexer url must specify https url".to_string());
+            return Err("Indexer url must etiher specify https url or be localhost".to_string());
         }
 
         Ok(())

src/bridge-did/src/init/rune.rs

@@ -73,10 +73,12 @@ pub enum IndexerType {
 impl IndexerType {
     fn validate(&self) -> Result<(), String> {
         match self {
-            Self::OrdHttp { url } if !url.starts_with("https") => {
-                Err("Indexer url must specify https url".to_string())
+            Self::OrdHttp { url }
+                if url.starts_with("https") || url.starts_with("http://localhost") =>
+            {
+                Ok(())
             }
-            _ => Ok(()),
+            _ => Err("Indexer url must etiher specify https url or be localhost".to_string()),
         }
     }
 

src/integration-tests/tests/context/brc20_bridge.rs

@@ -28,7 +28,6 @@ use ord_rs::Utxo;
 use tokio::sync::{Mutex, RwLock};
 use tokio::time::Instant;
 
-use super::CanisterType;
 use crate::context::TestContext;
 use crate::utils::brc20_helper::Brc20Helper;
 use crate::utils::btc_rpc_client::BitcoinRpcClient;
@@ -214,7 +213,7 @@ async fn brc20_setup(brc20_to_deploy: &[Brc20InitArgs]) -> anyhow::Result<Brc20W
 impl Brc20Context<crate::dfx_tests::DfxTestContext> {
     pub async fn dfx(brc20_to_deploy: &[Brc20InitArgs]) -> Self {
         let context =
-            crate::dfx_tests::DfxTestContext::new(&CanisterType::BRC20_CANISTER_SET).await;
+            crate::dfx_tests::DfxTestContext::new(&super::CanisterType::BRC20_CANISTER_SET).await;
 
         Self::new(context, brc20_to_deploy).await
     }
@@ -227,7 +226,7 @@ impl Brc20Context<crate::pocket_ic_integration_test::PocketIcTestContext> {
         use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
         let context = crate::pocket_ic_integration_test::PocketIcTestContext::new_with(
-            &CanisterType::BRC20_CANISTER_SET,
+            &super::CanisterType::BRC20_CANISTER_SET,
             |builder| {
                 builder
                     .with_ii_subnet()

src/integration-tests/tests/context/mod.rs

@@ -1075,7 +1075,7 @@ pub trait TestContext {
                     .expect("authorize failed");
                 assert!(res, "authorize failed");
                 let hostname = format!(
-                    "https://127.0.0.1:8002/?canisterId={}",
+                    "http://{}.raw.localhost:8000",
                     self.canisters().external_evm()
                 );
                 println!("EVM-RPC provider hostname: {hostname}");
@@ -1472,7 +1472,7 @@ pub fn rune_bridge_canister_init_data(
             btc_cache_timeout_secs: None,
             min_confirmations: 1,
             indexers: vec![IndexerType::OrdHttp {
-                url: "https://localhost:8001".to_string(),
+                url: "http://localhost:8000".to_string(),
             }],
             deposit_fee: 500_000,
             mempool_timeout: Duration::from_secs(60),
@@ -1493,7 +1493,7 @@ pub fn brc20_bridge_canister_init_data(
         Brc20BridgeConfig {
             network: BitcoinNetwork::Regtest,
             min_confirmations: 1,
-            indexer_urls: HashSet::from_iter(["https://localhost:8005".to_string()]),
+            indexer_urls: HashSet::from_iter(["http://localhost:8004".to_string()]),
             deposit_fee: 500_000,
             mempool_timeout: Duration::from_secs(60),
             indexer_consensus_threshold: 1,

src/integration-tests/tests/context/rune_bridge.rs

@@ -29,7 +29,6 @@ use rune_bridge::ops::RuneDepositRequestData;
 use tokio::sync::{Mutex, RwLock};
 use tokio::time::Instant;
 
-use super::CanisterType;
 use crate::context::TestContext;
 use crate::utils::btc_rpc_client::BitcoinRpcClient;
 use crate::utils::miner::{Exit, Miner};
@@ -158,7 +157,8 @@ async fn rune_setup(runes_to_etch: &[String]) -> anyhow::Result<RuneWallet> {
 #[cfg(feature = "dfx_tests")]
 impl RunesContext<crate::dfx_tests::DfxTestContext> {
     pub async fn dfx(runes_to_etch: &[String]) -> Self {
-        let context = crate::dfx_tests::DfxTestContext::new(&CanisterType::RUNE_CANISTER_SET).await;
+        let context =
+            crate::dfx_tests::DfxTestContext::new(&super::CanisterType::RUNE_CANISTER_SET).await;
 
         Self::new(context, runes_to_etch).await
     }
@@ -171,7 +171,7 @@ impl RunesContext<crate::pocket_ic_integration_test::PocketIcTestContext> {
         use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
         let context = crate::pocket_ic_integration_test::PocketIcTestContext::new_with(
-            &CanisterType::RUNE_CANISTER_SET,
+            &super::CanisterType::RUNE_CANISTER_SET,
             |builder| {
                 builder
                     .with_ii_subnet()

src/integration-tests/tests/dfx_tests/brc20_bridge.rs

@@ -137,6 +137,7 @@ async fn test_should_deposit_and_withdraw_brc20_tokens() {
 }
 
 #[tokio::test]
+#[serial_test::serial]
 async fn test_brc20_bridge_stress_test() {
     let context = crate::dfx_tests::DfxTestContext::new(&CanisterType::BRC20_CANISTER_SET).await;