Fix linter errors

Author: mengelbart

vnet/main.go

@@ -152,7 +152,11 @@ func (r *Runner) runVariableAvailableCapacitySingleFlow() error {
 	if err != nil {
 		return fmt.Errorf("new manager: %w", err)
 	}
-	defer nm.Close()
+	defer func() {
+		if closeErr := nm.Close(); closeErr != nil {
+			r.logger.Errorf("failed to close network manager: %v", closeErr)
+		}
+	}()
 
 	dataDir := fmt.Sprintf("data/%v", r.name)
 	err = os.MkdirAll(dataDir, 0o750)
@@ -203,6 +207,7 @@ func (r *Runner) runVariableAvailableCapacitySingleFlow() error {
 		},
 	}
 	r.runNetworkSimulation(path, nm)
+
 	return flow.Close()
 }
 
@@ -211,7 +216,11 @@ func (r *Runner) runVariableAvailableCapacityMultipleFlows() error {
 	if err != nil {
 		return fmt.Errorf("new manager: %w", err)
 	}
-	defer nm.Close()
+	defer func() {
+		if closeErr := nm.Close(); closeErr != nil {
+			r.logger.Errorf("failed to close network manager: %v", closeErr)
+		}
+	}()
 
 	dataDir := fmt.Sprintf("data/%v", r.name)
 	err = os.MkdirAll(dataDir, 0o750)
@@ -224,7 +233,8 @@ func (r *Runner) runVariableAvailableCapacityMultipleFlows() error {
 
 	var flows []Flow
 	for i := 0; i < 2; i++ {
-		flow, err := NewSimpleFlow(r.loggerFactory, nm, i, r.senderMode, dataDir)
+		var flow Flow
+		flow, err = NewSimpleFlow(r.loggerFactory, nm, i, r.senderMode, dataDir)
 		if err != nil {
 			return err
 		}
@@ -277,6 +287,7 @@ func (r *Runner) runVariableAvailableCapacityMultipleFlows() error {
 			panic(err)
 		}
 	}
+
 	return nil
 }
 

vnet/manager.go

@@ -39,7 +39,7 @@ func (r *RouterWithConfig) getIPMapping() (private, public string, err error) {
 	public = mapping[0]
 	private = mapping[1]
 
-	return
+	return private, public, err
 }
 
 // NetworkManager manages the virtual network topology for bandwidth estimation tests.
@@ -110,10 +110,19 @@ func NewManager() (*NetworkManager, error) {
 }
 
 func (m *NetworkManager) Close() error {
-	m.leftTBF.Close()
-	m.rightTBF.Close()
-	m.wan.Stop()
-	return nil
+	var errs []error
+
+	if err := m.leftTBF.Close(); err != nil {
+		errs = append(errs, err)
+	}
+	if err := m.rightTBF.Close(); err != nil {
+		errs = append(errs, err)
+	}
+	if err := m.wan.Stop(); err != nil {
+		errs = append(errs, err)
+	}
+
+	return errors.Join(errs...)
 }
 
 // GetLeftNet creates and returns a new Net on the left side of the network topology.

vnet/vnet_test.go

@@ -58,5 +58,4 @@ func TestVnet(t *testing.T) {
 			})
 		})
 	}
-
 }