From cad22e04f8ae37ad0925bbb2f6fd5ef8c8524aeb Mon Sep 17 00:00:00 2001
From: Henrique Dias <mail@hacdias.com>
Date: Thu, 28 Mar 2024 15:08:03 +0100
Subject: [PATCH] fix iptb sharness...

---
 test/sharness/lib/iptb-lib.sh                   | 9 +++------
 test/sharness/t0131-multinode-client-routing.sh | 3 ++-
 test/sharness/t0142-testfilter.sh               | 3 ++-
 test/sharness/t0181-private-network.sh          | 1 +
 test/sharness/t0182-circuit-relay.sh            | 3 ++-
 test/sharness/t0184-http-proxy-over-p2p.sh      | 1 +
 test/sharness/t0276-cidv0v1.sh                  | 3 ++-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/test/sharness/lib/iptb-lib.sh b/test/sharness/lib/iptb-lib.sh
index 51aaa1e49569..8b2d956c2e97 100644
--- a/test/sharness/lib/iptb-lib.sh
+++ b/test/sharness/lib/iptb-lib.sh
@@ -34,12 +34,9 @@ startup_cluster() {
   other_args="$@"
   bound=$(expr "$num_nodes" - 1)
 
-  for i in $(test_seq 0 "$bound")
-  do
-    test_expect_success "node $i allows loopback addresses on lan dht" '
-      ipfsi $i config --json "Routing.LoopbackAddressesOnLanDHT" true
-    '
-  done
+  test_expect_success "set Routing.LoopbackAddressesOnLanDHT to true" '
+    iptb run [0-$bound] -- ipfs config --json "Routing.LoopbackAddressesOnLanDHT" true
+  '
 
   if test -n "$other_args"; then
     test_expect_success "start up nodes with additional args" "
diff --git a/test/sharness/t0131-multinode-client-routing.sh b/test/sharness/t0131-multinode-client-routing.sh
index b62c9790b9c9..8949a1bdfd82 100755
--- a/test/sharness/t0131-multinode-client-routing.sh
+++ b/test/sharness/t0131-multinode-client-routing.sh
@@ -43,7 +43,8 @@ run_single_file_test() {
 NNODES=10
 
 test_expect_success "set up testbed" '
-  iptb testbed create -type localipfs -count $NNODES -force -init
+  iptb testbed create -type localipfs -count $NNODES -force -init &&
+  iptb run -- ipfs config --json "Routing.LoopbackAddressesOnLanDHT" true
 '
 
 test_expect_success "start up nodes" '
diff --git a/test/sharness/t0142-testfilter.sh b/test/sharness/t0142-testfilter.sh
index 971aa68397a2..bdd7e4f76b10 100755
--- a/test/sharness/t0142-testfilter.sh
+++ b/test/sharness/t0142-testfilter.sh
@@ -13,7 +13,8 @@ AF="/ip4/127.0.0.0/ipcidr/24"
 NUM_NODES=3
 
 test_expect_success "set up testbed" '
-  iptb testbed create -type localipfs -count $NUM_NODES -force -init
+  iptb testbed create -type localipfs -count $NUM_NODES -force -init &&
+  iptb run -- ipfs config --json "Routing.LoopbackAddressesOnLanDHT" true
 '
 
 test_expect_success 'filter 127.0.0.0/24 on node 1' '
diff --git a/test/sharness/t0181-private-network.sh b/test/sharness/t0181-private-network.sh
index 86c6151d3e48..46dc45cdf3c8 100755
--- a/test/sharness/t0181-private-network.sh
+++ b/test/sharness/t0181-private-network.sh
@@ -35,6 +35,7 @@ LIBP2P_FORCE_PNET=1 test_launch_ipfs_daemon
 
 test_expect_success "set up iptb testbed" '
   iptb testbed create -type localipfs -count 5 -force -init &&
+  iptb run -- ipfs config --json "Routing.LoopbackAddressesOnLanDHT" true &&
   iptb run -- ipfs config --json Addresses.Swarm  '"'"'["/ip4/127.0.0.1/tcp/0"]'"'"'
 '
 
diff --git a/test/sharness/t0182-circuit-relay.sh b/test/sharness/t0182-circuit-relay.sh
index d6e439ae3186..c79edfc8ea84 100755
--- a/test/sharness/t0182-circuit-relay.sh
+++ b/test/sharness/t0182-circuit-relay.sh
@@ -7,7 +7,8 @@ test_description="Test circuit relay"
 # start iptb + wait for peering
 NUM_NODES=3
 test_expect_success 'init iptb' '
-  iptb testbed create -type localipfs -count $NUM_NODES -init
+  iptb testbed create -type localipfs -count $NUM_NODES -init &&
+  iptb run -- ipfs config --json "Routing.LoopbackAddressesOnLanDHT" true
 '
 
 # Network toplogy: A <-> Relay <-> B
diff --git a/test/sharness/t0184-http-proxy-over-p2p.sh b/test/sharness/t0184-http-proxy-over-p2p.sh
index 9c5308277c25..98e2f3ab20c1 100755
--- a/test/sharness/t0184-http-proxy-over-p2p.sh
+++ b/test/sharness/t0184-http-proxy-over-p2p.sh
@@ -142,6 +142,7 @@ function curl_send_multipart_form_request() {
 
 test_expect_success 'configure nodes' '
     iptb testbed create -type localipfs -count 2 -force -init &&
+    iptb run -- ipfs config --json "Routing.LoopbackAddressesOnLanDHT" true &&
     ipfsi 0 config --json Experimental.Libp2pStreamMounting true &&
     ipfsi 1 config --json Experimental.Libp2pStreamMounting true &&
     ipfsi 0 config --json Experimental.P2pHttpProxy true &&
diff --git a/test/sharness/t0276-cidv0v1.sh b/test/sharness/t0276-cidv0v1.sh
index 2058a9d5497c..c810f45449dc 100755
--- a/test/sharness/t0276-cidv0v1.sh
+++ b/test/sharness/t0276-cidv0v1.sh
@@ -95,7 +95,8 @@ test_expect_success "check that we can access the file when converted to CIDv1"
 #
 
 test_expect_success "set up iptb testbed" '
-  iptb testbed create -type localipfs -count 2 -init
+  iptb testbed create -type localipfs -count 2 -init  &&
+  iptb run -- ipfs config --json "Routing.LoopbackAddressesOnLanDHT" true
 '
 
 test_expect_success "start nodes" '