fix: Include actual value in PathSegType.String()

refactor: Simplify code, use Stringer method

Author: romshark

control/segreq/authoritative.go

@@ -49,7 +49,7 @@ func (a AuthoritativeLookup) LookupSegments(
 	case seg.TypeCore:
 		return getCoreSegments(ctx, a.PathDB, a.LocalIA, dst)
 	default:
-		panic(fmt.Errorf("unexpected segType: %d (%s)", segType, segType.String()))
+		panic(fmt.Errorf("unexpected segType: %s", segType.String()))
 	}
 }
 

control/segreq/expander.go

@@ -57,8 +57,8 @@ func (e *WildcardExpander) ExpandSrcWildcard(ctx context.Context,
 	default:
 		// no wildcard source for up requests
 		panic(fmt.Errorf(
-			"unexpected wildcard for up segment request, should not have passed validation: %d",
-			req.SegType,
+			"unexpected wildcard for up segment request, should not have passed validation: %s",
+			req.SegType.String(),
 		))
 	}
 }

control/segreq/fetcher.go

@@ -199,8 +199,8 @@ func (p *dstProvider) Dst(ctx context.Context, req segfetcher.Request) (net.Addr
 	default:
 		panic(fmt.Errorf(
 			"unsupported segment type for request forwarding: "+
-				"up segment should have been resolved locally: %d (%s)",
-			req.SegType, req.SegType.String(),
+				"up segment should have been resolved locally: %s",
+			req.SegType.String(),
 		))
 	}
 	addr := &snet.SVCAddr{

daemon/cmd/daemon/main.go

@@ -128,8 +128,8 @@ func realMain(ctx context.Context) error {
 		SvcResolver: func(dst addr.SVC) []resolver.Address {
 			if base := dst.Base(); base != addr.SvcCS {
 				panic(fmt.Errorf(
-					"unsupported address type, possible implementation error: %d (%s)",
-					base, base.String(),
+					"unsupported address type, possible implementation error: %s",
+					base.String(),
 				))
 			}
 			targets := []resolver.Address{}

pkg/addr/host.go

@@ -99,7 +99,7 @@ func (h Host) Type() HostAddrType {
 // Panics if h.Type() is not HostTypeIP.
 func (h Host) IP() netip.Addr {
 	if h.t != HostTypeIP {
-		panic(fmt.Errorf("IP called on non-IP address: %d (%s)", h.t, h.t.String()))
+		panic(fmt.Errorf("IP called on non-IP address: %s", h.t.String()))
 	}
 	return h.ip
 }
@@ -108,7 +108,7 @@ func (h Host) IP() netip.Addr {
 // Panics if h.Type() is not HostTypeSVC.
 func (h Host) SVC() SVC {
 	if h.t != HostTypeSVC {
-		panic(fmt.Errorf("SVC called on non-SVC address: %d (%s)", h.t, h.t.String()))
+		panic(fmt.Errorf("SVC called on non-SVC address: %s", h.t.String()))
 	}
 	return h.svc
 }
@@ -122,7 +122,7 @@ func (h Host) String() string {
 	case HostTypeSVC:
 		return h.svc.String()
 	default:
-		panic(fmt.Errorf("unsupported host type: %d (%s)", t, t.String()))
+		panic(fmt.Errorf("unsupported host type: %s", t.String()))
 	}
 }
 

pkg/private/ctrl/path_mgmt/proto/defs.go

@@ -21,6 +21,8 @@ suitable place eventually.
 */
 package proto
 
+import "fmt"
+
 type LinkType uint16
 
 // Values of LinkType.
@@ -92,9 +94,8 @@ func (c PathSegType) String() string {
 		return "down"
 	case PathSegType_core:
 		return "core"
-
 	default:
-		return ""
+		return fmt.Sprintf("unknown(%d)", c)
 	}
 }
 

pkg/slayers/path/path.go

@@ -75,8 +75,8 @@ type Metadata struct {
 func RegisterPath(pathMeta Metadata) {
 	pm := registeredPaths[pathMeta.Type]
 	if pm.inUse {
-		panic(fmt.Errorf("path type already registered: %d (%s)",
-			pathMeta.Type, pathMeta.Type.String()))
+		panic(fmt.Errorf("path type already registered: %s",
+			pathMeta.Type.String()))
 	}
 	registeredPaths[pathMeta.Type].inUse = true
 	registeredPaths[pathMeta.Type].Metadata = pathMeta

private/path/combinator/graph.go

@@ -592,7 +592,7 @@ func validNextSeg(currSeg, nextSeg *inputSegment) bool {
 	case proto.PathSegType_down:
 		return false
 	default:
-		panic(fmt.Sprintf("Invalid segment type: %d", currSeg.Type))
+		panic(fmt.Sprintf("Invalid segment type: %s", currSeg.Type.String()))
 	}
 }
 

router/dataplane.go

@@ -1855,8 +1855,8 @@ func (d *dataPlane) resolveLocalDst(
 		}
 		return d.addEndhostPort(resolvedDst, lastLayer, dstIP)
 	default:
-		panic(fmt.Errorf("unexpected address type returned from DstAddr: %d (%s)",
-			dstType, dstType.String()))
+		panic(fmt.Errorf("unexpected address type returned from DstAddr: %s",
+			dstType.String()))
 	}
 }