Merge #188

188: Tor cleanup r=da-kami a=da-kami

We never removed Tor install from CI. I don't think it should be necessary given that Tor was removed in code.

Co-authored-by: Daniel Karzel <daniel@comit.network>

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Run clippy with default features
         run: cargo clippy --workspace --all-targets -- -D warnings
 
-      - name: Run clippy with all features enabled (e.g. tor)
+      - name: Run clippy with all features enabled
         run: cargo clippy --workspace --all-targets --all-features -- -D warnings
 
   build_test:
@@ -64,17 +64,6 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v2
 
-      - name: Install and stop tor in case it was running
-        if: (matrix.os == 'ubuntu-latest' && !matrix.skip_tests)
-        run: |
-          sudo apt install software-properties-common
-          sudo curl https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | sudo gpg --import
-          sudo gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add -
-          sudo add-apt-repository 'deb https://deb.torproject.org/torproject.org bionic main'
-          sudo apt update
-          sudo apt install tor deb.torproject.org-keyring
-          sudo /etc/init.d/tor stop
-
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:

swap/src/network/transport.rs

@@ -13,7 +13,7 @@ use libp2p::{
     yamux, PeerId,
 };
 
-/// Builds a libp2p transport without Tor with the following features:
+/// Builds a libp2p transport with the following features:
 /// - TcpConnection
 /// - DNS name resolution
 /// - authentication via noise