Revert changes happening upstream.

pkg/addr/isdas.go

@@ -67,10 +67,10 @@ type AS uint64
 // ParseAS parses an AS from a decimal (in the case of the 32bit BGP AS number
 // space) or ipv6-style hex (in the case of SCION-only AS numbers) string.
 func ParseAS(as string) (AS, error) {
-	return ParseASSep(as, ":")
+	return parseAS(as, ":")
 }
 
-func ParseASSep(as string, sep string) (AS, error) {
+func parseAS(as string, sep string) (AS, error) {
 	parts := strings.Split(as, sep)
 	if len(parts) == 1 {
 		// Must be a BGP AS, parse as 32-bit decimal number

tools/integration/docker.go

@@ -57,6 +57,7 @@ func dockerize(bi *binaryIntegration) Integration {
 	return bi
 }
 
+// StartServer starts a server and blocks until the ReadySignal is received on Stdout.
 func (di *dockerIntegration) StartServer(ctx context.Context, dst *snet.UDPAddr) (Waiter, error) {
 	bi := *di.binaryIntegration
 	bi.serverArgs = append(dockerArgs, append([]string{TesterID(dst), bi.cmd}, bi.serverArgs...)...)

tools/integration/integration.go

@@ -218,8 +218,7 @@ func generateAllSrcDst(hostAddr HostAddr, unique bool) []IAPair {
 
 type HostAddr func(ia addr.IA) *snet.UDPAddr
 
-// CSAddr reads the tester host Addr from the topology for the specified IA.
-// If the address cannot be found, the CS address is returned.
+// CSAddr reads the CS host Addr from the topology for the specified IA.
 var CSAddr HostAddr = func(ia addr.IA) *snet.UDPAddr {
 	if a := loadAddr(ia); a != nil {
 		return a