Close beacon node connection when done, and add comments

validator/accounts/status.go

@@ -27,18 +27,19 @@ func FetchAccountStatuses(ctx context.Context, keyPairs map[string]*keystore.Key
 	defer span.End()
 
 	var err error
-	beaconNodeRPC, err := beaconNodeRPCProvider()
+	beaconConn, err := beaconNodeRPCProvider()
 	if err != nil {
 		return nil, errors.Wrap(err, "Cannot connect to Beacon Node.")
 	}
+	defer beaconConn.Close()
 
-	const RequestLimit = 3
+	const ConnLimit = 3
 	statuses := make([]*ethpb.ValidatorStatusResponse, 0, len(keyPairs))
-	errorChannel := make(chan error, RequestLimit)
-	statusChannel := make(chan *ethpb.ValidatorStatusResponse, RequestLimit)
+	errorChannel := make(chan error, ConnLimit)
+	statusChannel := make(chan *ethpb.ValidatorStatusResponse, ConnLimit)
 
 	for _, key := range keyPairs {
-		go fetchValidatorStatus(ctx, beaconNodeRPC, key.PublicKey.Marshal(), statusChannel, errorChannel)
+		go fetchValidatorStatus(ctx, beaconConn, key.PublicKey.Marshal(), statusChannel, errorChannel)
 	}
 
 	for i := 0; i < len(keyPairs); i++ {
@@ -51,6 +52,8 @@ func FetchAccountStatuses(ctx context.Context, keyPairs map[string]*keystore.Key
 	}
 
 	// Sort responses by status
+	// XXX: This sort does not work right now. We need to have the
+	// public key of the validator indicated in the response.
 	sort.Slice(statuses, func(i, j int) bool {
 		return statuses[i].Status < statuses[j].Status
 	})