Undo unneeded formatting changes

pkg/snet/path/path.go

@@ -62,7 +62,7 @@ func (p Path) Destination() addr.IA {
 }
 
 func (p Path) Metadata() *snet.PathMetadata {
- return &p.Meta
+ return p.Meta.Copy()
 }
 
 func (p Path) String() string {

private/path/combinator/graph.go

@@ -311,7 +311,6 @@ type pathSolution struct {
 
 // Path builds the forwarding path with metadata by extracting it from a path
 // between source and destination in the DMG.
-
 func (solution *pathSolution) Path() Path {
  mtu := ^uint16(0)
  var segments segmentList

proto/daemon/v1/daemon.proto

@@ -107,7 +107,7 @@ message Path {
  // Consequently, there are no entries for the first and last ASes, as these
  // are not traversed completely by the path.
  repeated uint32 internal_hops = 10;
- // Notes contains the notes added by ASes on the path, in the lorder of
+ // Notes contains the notes added by ASes on the path, in the order of
  // occurrence.
  // Entry i is the note of AS i on the path.
  repeated string notes = 11;

router/dataplane_test.go

@@ -1071,8 +1071,7 @@ func TestDataPlaneRun(t *testing.T) {
 
  return 0, fmt.Errorf("no valid BFD message")
  }).MinTimes(1)
- mInternal.EXPECT().WriteTo(gomock.Any(), gomock.Any()).Return(0, nil).
- AnyTimes()
+ mInternal.EXPECT().WriteTo(gomock.Any(), gomock.Any()).Return(0, nil).AnyTimes()
 
  local := &net.UDPAddr{IP: net.ParseIP("10.0.200.100").To4()}
  _ = ret.SetKey([]byte("randomkeyformacs"))
@@ -1172,8 +1171,7 @@ func TestDataPlaneRun(t *testing.T) {
  done <- struct{}{}
  return 1, nil
  }).MinTimes(1)
- mExternal.EXPECT().WriteTo(gomock.Any(), gomock.Any()).Return(0, nil).
- AnyTimes()
+ mExternal.EXPECT().WriteTo(gomock.Any(), gomock.Any()).Return(0, nil).AnyTimes()
 
  local := control.LinkEnd{
  IA: xtest.MustParseIA("1-ff00:0:1"),
@@ -1251,8 +1249,7 @@ func TestDataPlaneRun(t *testing.T) {
  }
  return 0, fmt.Errorf("no valid BFD message")
  }).MinTimes(1)
- mExternal.EXPECT().WriteTo(gomock.Any(), gomock.Any()).Return(0, nil).
- AnyTimes()
+ mExternal.EXPECT().WriteTo(gomock.Any(), gomock.Any()).Return(0, nil).AnyTimes()
 
  local := control.LinkEnd{
  IA: xtest.MustParseIA("1-ff00:0:1"),

tools/topology/common.py

@@ -116,8 +116,8 @@ def join_host_port(host: str, port: int) -> str:
  return '[{}]:{}'.format(host, port)
 
 
-def sciond_ip(docker, topo_id,
- networks: Mapping[IPNetwork, NetworkDescription]):
+def sciond_ip(docker, topo_id, networks: Mapping[IPNetwork,
+   NetworkDescription]):
  for net_desc in networks.values():
  for prog, ip_net in net_desc.ip_net.items():
  if prog == 'sd%s' % topo_id.file_fmt():
@@ -126,7 +126,8 @@ def sciond_ip(docker, topo_id,
 
 
 def prom_addr_dispatcher(docker, topo_id,
- networks: Mapping[IPNetwork, NetworkDescription], port, name):
+ networks: Mapping[IPNetwork,
+ NetworkDescription], port, name):
  if not docker:
  return "[127.0.0.1]:%s" % port
  target_name = ''