Cleanup confusing variable assignments (ava-labs#2268)

api/keystore/keystore.go

@@ -242,12 +242,12 @@ func (ks *keystore) DeleteUser(username, pw string) error {
 	defer it.Release()
 
 	for it.Next() {
-		if err = dataBatch.Delete(it.Key()); err != nil {
+		if err := dataBatch.Delete(it.Key()); err != nil {
 			return err
 		}
 	}
 
-	if err = it.Error(); err != nil {
+	if err := it.Error(); err != nil {
 		return err
 	}
 

api/keystore/service_test.go

@@ -405,7 +405,8 @@ func TestServiceDeleteUser(t *testing.T) {
 				}
 
 				// deleted user details should be available to create user again.
-				if err = s.CreateUser(nil, &api.UserPass{Username: testUser, Password: password}, &api.EmptyReply{}); err != nil {
+				err := s.CreateUser(nil, &api.UserPass{Username: testUser, Password: password}, &api.EmptyReply{})
+				if err != nil {
 					t.Fatalf("failed to create user: %v", err)
 				}
 			}

config/config.go

@@ -223,7 +223,8 @@ func getHTTPConfig(v *viper.Viper) (node.HTTPConfig, error) {
 		}
 	case v.IsSet(HTTPSKeyFileKey):
 		httpsKeyFilepath := GetExpandedArg(v, HTTPSKeyFileKey)
-		if httpsKey, err = os.ReadFile(filepath.Clean(httpsKeyFilepath)); err != nil {
+		httpsKey, err = os.ReadFile(filepath.Clean(httpsKeyFilepath))
+		if err != nil {
 			return node.HTTPConfig{}, err
 		}
 	}
@@ -237,7 +238,8 @@ func getHTTPConfig(v *viper.Viper) (node.HTTPConfig, error) {
 		}
 	case v.IsSet(HTTPSCertFileKey):
 		httpsCertFilepath := GetExpandedArg(v, HTTPSCertFileKey)
-		if httpsCert, err = os.ReadFile(filepath.Clean(httpsCertFilepath)); err != nil {
+		httpsCert, err = os.ReadFile(filepath.Clean(httpsCertFilepath))
+		if err != nil {
 			return node.HTTPConfig{}, err
 		}
 	}

database/test_database.go

@@ -261,7 +261,7 @@ func TestBatchPut(t *testing.T, db Database) {
 		t.Fatalf("Unexpected error on db.Delete: %s", err)
 	}
 
-	if batch = db.NewBatch(); batch == nil {
+	if batch := db.NewBatch(); batch == nil {
 		t.Fatalf("db.NewBatch returned nil")
 	} else if err := batch.Put(key, value); err != nil {
 		t.Fatalf("Unexpected error on batch.Put: %s", err)

indexer/index.go

@@ -212,7 +212,7 @@ func (i *index) getContainerByIndexBytes(indexBytes []byte) (Container, error) {
 		return Container{}, fmt.Errorf("couldn't read from database: %w", err)
 	}
 	var container Container
-	if _, err = i.codec.Unmarshal(containerBytes, &container); err != nil {
+	if _, err := i.codec.Unmarshal(containerBytes, &container); err != nil {
 		return Container{}, fmt.Errorf("couldn't unmarshal container: %w", err)
 	}
 	return container, nil

ipcs/socket/socket_test.go

@@ -47,11 +47,11 @@ func TestSocketSendAndReceive(t *testing.T) {
 
 	// Test max message size
 	client.SetMaxMessageSize(msgLen)
-	if _, err = client.Recv(); err != nil {
+	if _, err := client.Recv(); err != nil {
 		t.Fatal("Failed to receive from socket:", err.Error())
 	}
 	client.SetMaxMessageSize(msgLen - 1)
-	if _, err = client.Recv(); err != ErrMessageTooLarge {
+	if _, err := client.Recv(); err != ErrMessageTooLarge {
 		t.Fatal("Should have received message too large error, got:", err)
 	}
 }

ipcs/socket/socket_unix.go

@@ -23,18 +23,19 @@ func listen(addr string) (net.Listener, error) {
 		return nil, err
 	}
 
-	// Try to listen on the socket. If that fails we check to see if it's a stale
-	// socket and remove it if it is. Then we try to listen one more time.
+	// Try to listen on the socket.
 	l, err := net.ListenUnix("unix", uAddr)
-	if err != nil {
-		if err = removeIfStaleUnixSocket(addr); err != nil {
-			return nil, err
-		}
-		if l, err = net.ListenUnix("unix", uAddr); err != nil {
-			return nil, err
-		}
+	if err == nil {
+		return l, nil
 	}
-	return l, err
+
+	// Check to see if the socket is stale and remove it if it is.
+	if err := removeIfStaleUnixSocket(addr); err != nil {
+		return nil, err
+	}
+
+	// Try listening again now that it shouldn't be stale.
+	return net.ListenUnix("unix", uAddr)
 }
 
 // Dial creates a new *Client connected to the given address over a Unix socket
@@ -59,13 +60,16 @@ func Dial(addr string) (*Client, error) {
 // that is refusing connections
 func removeIfStaleUnixSocket(socketPath string) error {
 	// Ensure it's a socket; if not return without an error
-	if st, err := os.Stat(socketPath); err != nil || st.Mode()&os.ModeType != os.ModeSocket {
+	st, err := os.Stat(socketPath)
+	if err != nil {
+		return nil
+	}
+	if st.Mode()&os.ModeType != os.ModeSocket {
 		return nil
 	}
 
 	// Try to connect
 	conn, err := net.DialTimeout("unix", socketPath, staleSocketTimeout)
-
 	switch {
 	// The connection was refused so this socket is stale; remove it
 	case isSyscallError(err, syscall.ECONNREFUSED):
@@ -74,6 +78,8 @@ func removeIfStaleUnixSocket(socketPath string) error {
 	// The socket is alive so close this connection and leave the socket alone
 	case err == nil:
 		return conn.Close()
+
+	default:
+		return nil
 	}
-	return nil
 }

node/node.go

@@ -1237,7 +1237,6 @@ func (n *Node) Initialize(
 ) error {
 	n.Log = logger
 	n.Config = config
-	var err error
 	n.ID = ids.NodeIDFromCert(n.Config.StakingTLSCert.Leaf)
 	n.LogFactory = logFactory
 	n.DoneShuttingDown.Add(1)
@@ -1251,11 +1250,12 @@ func (n *Node) Initialize(
 		zap.Reflect("config", n.Config),
 	)
 
-	if err = n.initBeacons(); err != nil { // Configure the beacons
+	if err := n.initBeacons(); err != nil { // Configure the beacons
 		return fmt.Errorf("problem initializing node beacons: %w", err)
 	}
 
 	// Set up tracer
+	var err error
 	n.tracer, err = trace.New(n.Config.TraceConfig)
 	if err != nil {
 		return fmt.Errorf("couldn't initialize tracer: %w", err)
@@ -1307,7 +1307,7 @@ func (n *Node) Initialize(
 	}
 	n.initCPUTargeter(&config.CPUTargeterConfig, primaryNetVdrs)
 	n.initDiskTargeter(&config.DiskTargeterConfig, primaryNetVdrs)
-	if err = n.initNetworking(primaryNetVdrs); err != nil { // Set up networking layer.
+	if err := n.initNetworking(primaryNetVdrs); err != nil { // Set up networking layer.
 		return fmt.Errorf("problem initializing networking: %w", err)
 	}
 

snow/consensus/avalanche/poll/set_test.go

@@ -70,11 +70,11 @@ func TestCreateAndFinishPoll(t *testing.T) {
 		t.Fatalf("Should only have one active poll")
 	} else if results := s.Vote(1, vdr1, votes); len(results) > 0 {
 		t.Fatalf("Shouldn't have been able to finish a non-existent poll")
-	} else if results = s.Vote(0, vdr1, votes); len(results) > 0 {
+	} else if results := s.Vote(0, vdr1, votes); len(results) > 0 {
 		t.Fatalf("Shouldn't have been able to finish an ongoing poll")
-	} else if results = s.Vote(0, vdr1, votes); len(results) > 0 {
+	} else if results := s.Vote(0, vdr1, votes); len(results) > 0 {
 		t.Fatalf("Should have dropped a duplicated poll")
-	} else if results = s.Vote(0, vdr2, votes); len(results) == 0 {
+	} else if results := s.Vote(0, vdr2, votes); len(results) == 0 {
 		t.Fatalf("Should have finished the poll")
 	} else if len(results) != 1 {
 		t.Fatalf("Wrong number of results returned")

snow/consensus/snowman/poll/set_test.go

@@ -245,11 +245,11 @@ func TestCreateAndFinishSuccessfulPoll(t *testing.T) {
 		t.Fatalf("Should only have one active poll")
 	} else if results := s.Vote(1, vdr1, vtxID); len(results) > 0 {
 		t.Fatalf("Shouldn't have been able to finish a non-existent poll")
-	} else if results = s.Vote(0, vdr1, vtxID); len(results) > 0 {
+	} else if results := s.Vote(0, vdr1, vtxID); len(results) > 0 {
 		t.Fatalf("Shouldn't have been able to finish an ongoing poll")
-	} else if results = s.Vote(0, vdr1, vtxID); len(results) > 0 {
+	} else if results := s.Vote(0, vdr1, vtxID); len(results) > 0 {
 		t.Fatalf("Should have dropped a duplicated poll")
-	} else if results = s.Vote(0, vdr2, vtxID); len(results) == 0 {
+	} else if results := s.Vote(0, vdr2, vtxID); len(results) == 0 {
 		t.Fatalf("Should have finished the")
 	} else if len(results) != 1 {
 		t.Fatalf("Wrong number of results returned")
@@ -290,11 +290,11 @@ func TestCreateAndFinishFailedPoll(t *testing.T) {
 		t.Fatalf("Should only have one active poll")
 	} else if results := s.Drop(1, vdr1); len(results) > 0 {
 		t.Fatalf("Shouldn't have been able to finish a non-existent poll")
-	} else if results = s.Drop(0, vdr1); len(results) > 0 {
+	} else if results := s.Drop(0, vdr1); len(results) > 0 {
 		t.Fatalf("Shouldn't have been able to finish an ongoing poll")
-	} else if results = s.Drop(0, vdr1); len(results) > 0 {
+	} else if results := s.Drop(0, vdr1); len(results) > 0 {
 		t.Fatalf("Should have dropped a duplicated poll")
-	} else if results = s.Drop(0, vdr2); len(results) == 0 {
+	} else if results := s.Drop(0, vdr2); len(results) == 0 {
 		t.Fatalf("Should have finished the")
 	} else if list := results[0].List(); len(list) != 0 {
 		t.Fatalf("Wrong number of vertices returned")

snow/engine/avalanche/state/state.go

@@ -28,18 +28,13 @@ type state struct {
 // Returns nil if it's not found.
 // TODO this should return an error
 func (s *state) Vertex(id ids.ID) vertex.StatelessVertex {
-	var (
-		vtx   vertex.StatelessVertex
-		bytes []byte
-		err   error
-	)
-
 	if vtxIntf, found := s.dbCache.Get(id); found {
-		vtx, _ = vtxIntf.(vertex.StatelessVertex)
+		vtx, _ := vtxIntf.(vertex.StatelessVertex)
 		return vtx
 	}
 
-	if bytes, err = s.db.Get(id[:]); err != nil {
+	bytes, err := s.db.Get(id[:])
+	if err != nil {
 		s.log.Verbo("failed to get vertex from database",
 			zap.Binary("key", id[:]),
 			zap.Error(err),
@@ -48,7 +43,8 @@ func (s *state) Vertex(id ids.ID) vertex.StatelessVertex {
 		return nil
 	}
 
-	if vtx, err = s.serializer.parseVertex(bytes); err != nil {
+	vtx, err := s.serializer.parseVertex(bytes)
+	if err != nil {
 		s.log.Error("failed parsing saved vertex",
 			zap.Binary("key", id[:]),
 			zap.Binary("vertex", bytes),

snow/engine/snowman/block/batched_vm.go

@@ -74,7 +74,8 @@ func GetAncestors(
 	ancestorsBytesLen := len(blk.Bytes()) + wrappers.IntLen // length, in bytes, of all elements of ancestors
 
 	for numFetched := 1; numFetched < maxBlocksNum && time.Since(startTime) < maxBlocksRetrivalTime; numFetched++ {
-		if blk, err = vm.GetBlock(ctx, blk.Parent()); err != nil {
+		blk, err = vm.GetBlock(ctx, blk.Parent())
+		if err != nil {
 			break
 		}
 		blkBytes := blk.Bytes()

snow/engine/snowman/syncer/state_syncer.go

@@ -416,7 +416,7 @@ func (ss *stateSyncer) startup(ctx context.Context) error {
 	}
 
 	ss.frontierSeeders = validators.NewSet()
-	if err = ss.frontierSeeders.Set(beacons); err != nil {
+	if err := ss.frontierSeeders.Set(beacons); err != nil {
 		return err
 	}
 

snow/engine/snowman/transitive.go

@@ -586,12 +586,13 @@ func (t *Transitive) issueWithAncestors(ctx context.Context, blk snowman.Block)
 	// issue [blk] and its ancestors into consensus
 	status := blk.Status()
 	for status.Fetched() && !t.wasIssued(blk) {
-		if err := t.issue(ctx, blk); err != nil {
+		err := t.issue(ctx, blk)
+		if err != nil {
 			return false, err
 		}
 		blkID = blk.Parent()
-		var err error
-		if blk, err = t.GetBlock(ctx, blkID); err != nil {
+		blk, err = t.GetBlock(ctx, blkID)
+		if err != nil {
 			status = choices.Unknown
 			break
 		}

vms/avm/service_test.go

@@ -2437,7 +2437,7 @@ func TestImportExportKey(t *testing.T) {
 		PrivateKey: sk,
 	}
 	importReply := &api.JSONAddress{}
-	if err = s.ImportKey(nil, importArgs, importReply); err != nil {
+	if err := s.ImportKey(nil, importArgs, importReply); err != nil {
 		t.Fatal(err)
 	}
 
@@ -2453,7 +2453,7 @@ func TestImportExportKey(t *testing.T) {
 		Address: addrStr,
 	}
 	exportReply := &ExportKeyReply{}
-	if err = s.ExportKey(nil, exportArgs, exportReply); err != nil {
+	if err := s.ExportKey(nil, exportArgs, exportReply); err != nil {
 		t.Fatal(err)
 	}
 
@@ -2486,7 +2486,7 @@ func TestImportAVMKeyNoDuplicates(t *testing.T) {
 		PrivateKey: sk,
 	}
 	reply := api.JSONAddress{}
-	if err = s.ImportKey(nil, &args, &reply); err != nil {
+	if err := s.ImportKey(nil, &args, &reply); err != nil {
 		t.Fatal(err)
 	}
 
@@ -2500,7 +2500,7 @@ func TestImportAVMKeyNoDuplicates(t *testing.T) {
 	}
 
 	reply2 := api.JSONAddress{}
-	if err = s.ImportKey(nil, &args, &reply2); err != nil {
+	if err := s.ImportKey(nil, &args, &reply2); err != nil {
 		t.Fatal(err)
 	}
 
@@ -2644,7 +2644,7 @@ func TestSendMultiple(t *testing.T) {
 				t.Fatal("Transaction ID returned by SendMultiple does not match the transaction found in vm's pending transactions")
 			}
 
-			if _, err = vm.GetTx(context.Background(), reply.TxID); err != nil {
+			if _, err := vm.GetTx(context.Background(), reply.TxID); err != nil {
 				t.Fatalf("Failed to retrieve created transaction: %s", err)
 			}
 		})

vms/avm/tx_semantic_verify_test.go

@@ -226,7 +226,7 @@ func TestBaseTxSemanticVerifyUnauthorizedFx(t *testing.T) {
 	}
 	vm.batchTimeout = 0
 
-	if err = vm.SetState(context.Background(), snow.Bootstrapping); err != nil {
+	if err := vm.SetState(context.Background(), snow.Bootstrapping); err != nil {
 		t.Fatal(err)
 	}
 
@@ -645,7 +645,7 @@ func TestBaseTxSemanticVerifyPendingUnauthorizedFx(t *testing.T) {
 	}
 	vm.batchTimeout = 0
 
-	if err = vm.SetState(context.Background(), snow.Bootstrapping); err != nil {
+	if err := vm.SetState(context.Background(), snow.Bootstrapping); err != nil {
 		t.Fatal(err)
 	}
 
@@ -793,7 +793,7 @@ func TestBaseTxSemanticVerifyPendingInvalidSignature(t *testing.T) {
 	}
 	vm.batchTimeout = 0
 
-	if err = vm.SetState(context.Background(), snow.Bootstrapping); err != nil {
+	if err := vm.SetState(context.Background(), snow.Bootstrapping); err != nil {
 		t.Fatal(err)
 	}