post merge fixes

algorand · Mar 22, 2024 · ac58d8e · ac58d8e
1 parent e3a378e
commit ac58d8e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/network/p2pNetwork.go b/network/p2pNetwork.go
@@ -615,15 +615,6 @@ func (n *P2PNetwork) GetPeers(options ...PeerOption) []Peer {
 					n.log.Debugf("Archival node(s) from DHT: %v", addrs)
 				}
 			}
-		case PeersPhonebookArchivers:
-			// TODO: remove after merging with master
-			// temporary return all nodes
-			n.wsPeersLock.RLock()
-			for _, peer := range n.wsPeers {
-				peers = append(peers, Peer(peer))
-			}
-			n.wsPeersLock.RUnlock()
-
 		case PeersConnectedIn:
 			n.wsPeersLock.RLock()
 			for _, peer := range n.wsPeers {

diff --git a/network/wsNetwork_test.go b/network/wsNetwork_test.go
@@ -1186,7 +1186,7 @@ func TestGetPeers(t *testing.T) {
 	phbMulti.ReplacePeerList([]string{"a", "b", "c"}, "ph", phonebook.PhoneBookEntryRelayRole)
 
 	// A few for archival node roles
-	phbMulti.ReplacePeerList([]string{"d", "e", "f"}, "ph", PhoneBookEntryArchivalRole)
+	phbMulti.ReplacePeerList([]string{"d", "e", "f"}, "ph", phonebook.PhoneBookEntryArchivalRole)
 
 	//addrB, _ := netB.Address()
 

diff --git a/rpcs/healthService_test.go b/rpcs/healthService_test.go
@@ -17,13 +17,14 @@
 package rpcs
 
 import (
-	"github.com/algorand/go-algorand/network"
-	"github.com/algorand/go-algorand/test/partitiontest"
-	"github.com/stretchr/testify/require"
 	"io"
 	"net/http"
 	"path"
 	"testing"
+
+	"github.com/algorand/go-algorand/network/addr"
+	"github.com/algorand/go-algorand/test/partitiontest"
+	"github.com/stretchr/testify/require"
 )
 
 func TestHealthService_ServeHTTP(t *testing.T) {
@@ -35,7 +36,7 @@ func TestHealthService_ServeHTTP(t *testing.T) {
 
 	_ = MakeHealthService(nodeA)
 
-	parsedURL, err := network.ParseHostOrURL(nodeA.rootURL())
+	parsedURL, err := addr.ParseHostOrURL(nodeA.rootURL())
 	require.NoError(t, err)
 
 	client := http.Client{}