Electron Upgrade progress

.github/workflows/makefile.yml

@@ -28,10 +28,11 @@ jobs:
       with:
         go-version: '1.15'
 
-    - name: Use Node.js 12.13
+    - name: Use Node.js 14.21.3
       uses: actions/setup-node@v3
       with:
-        node-version: '12.22.12'
+        node-version: '14.21.3'
+    - run: npm install -g npm@6.x.x
 
     - name: Set up GCC
       uses: egor-tensin/setup-gcc@v1

aether-core/aether/backend/beapiserver/srvmethods.go

@@ -11,11 +11,9 @@ import (
 	"aether-core/aether/services/create"
 	"aether-core/aether/services/globals"
 	"aether-core/aether/services/logging"
-
 	// "google.golang.org/grpc"
 	// "google.golang.org/grpc/reflection"
 	"fmt"
-
 	"golang.org/x/net/context"
 )
 
@@ -44,9 +42,8 @@ func (s *server) GetBoards(
 	if fps == nil {
 		fps = &pb.Fingerprints{}
 	}
-	var apiFps []api.Fingerprint
-
-	for key := range fps.Fingerprints {
+	apiFps := []api.Fingerprint{}
+	for key, _ := range fps.Fingerprints {
 		apiFps = append(apiFps, api.Fingerprint(fps.Fingerprints[key]))
 	}
 	apiStart := api.Timestamp(start)
@@ -58,7 +55,7 @@ func (s *server) GetBoards(
 		Board_Name:          req.GetFilters().GetGraphFilters().GetName(),
 	}
 	result, _ := persistence.Read("boards", apiFps, []string{}, apiStart, apiEnd, true, &opts)
-	for key := range result.Boards {
+	for key, _ := range result.Boards {
 		r := result.Boards[key].Protobuf()
 		resp.Boards = append(resp.Boards, &r)
 	}
@@ -77,9 +74,8 @@ func (s *server) GetThreads(
 	start := req.GetFilters().GetLastRefTimeRange().GetStart()
 	end := req.GetFilters().GetLastRefTimeRange().GetEnd()
 	fps := req.GetFilters().GetFingerprints().GetFingerprints()
-	var apiFps []api.Fingerprint
-
-	for key := range fps {
+	apiFps := []api.Fingerprint{}
+	for key, _ := range fps {
 		apiFps = append(apiFps, api.Fingerprint(fps[key]))
 	}
 	apiStart := api.Timestamp(start)
@@ -92,7 +88,7 @@ func (s *server) GetThreads(
 		AllProvables_Offset: int(req.GetFilters().GetGraphFilters().GetOffset()),
 	}
 	result, _ := persistence.Read("threads", apiFps, []string{}, apiStart, apiEnd, true, &opts)
-	for key := range result.Threads {
+	for key, _ := range result.Threads {
 		r := result.Threads[key].Protobuf()
 		resp.Threads = append(resp.Threads, &r)
 	}
@@ -111,9 +107,8 @@ func (s *server) GetPosts(
 	start := api.Timestamp(req.GetFilters().GetLastRefTimeRange().GetStart())
 	end := api.Timestamp(req.GetFilters().GetLastRefTimeRange().GetEnd())
 	fps := req.GetFilters().GetFingerprints().GetFingerprints()
-	var apiFps []api.Fingerprint
-
-	for key := range fps {
+	apiFps := []api.Fingerprint{}
+	for key, _ := range fps {
 		apiFps = append(apiFps, api.Fingerprint(fps[key]))
 	}
 	result, _ := persistence.Read("posts", apiFps, []string{}, start, end, true, &persistence.OptionalReadInputs{
@@ -124,7 +119,7 @@ func (s *server) GetPosts(
 		AllProvables_Limit:  int(req.GetFilters().GetGraphFilters().GetLimit()),
 		AllProvables_Offset: int(req.GetFilters().GetGraphFilters().GetOffset()),
 	})
-	for key := range result.Posts {
+	for key, _ := range result.Posts {
 		r := result.Posts[key].Protobuf()
 		resp.Posts = append(resp.Posts, &r)
 	}
@@ -143,9 +138,8 @@ func (s *server) GetVotes(
 	start := api.Timestamp(req.GetFilters().GetLastRefTimeRange().GetStart())
 	end := api.Timestamp(req.GetFilters().GetLastRefTimeRange().GetEnd())
 	fps := req.GetFilters().GetFingerprints().GetFingerprints()
-	var apiFps []api.Fingerprint
-
-	for key := range fps {
+	apiFps := []api.Fingerprint{}
+	for key, _ := range fps {
 		apiFps = append(apiFps, api.Fingerprint(fps[key]))
 	}
 	result, _ := persistence.Read("votes", apiFps, []string{}, start, end, true,
@@ -160,7 +154,7 @@ func (s *server) GetVotes(
 			AllProvables_Limit:  int(req.GetFilters().GetGraphFilters().GetLimit()),
 			AllProvables_Offset: int(req.GetFilters().GetGraphFilters().GetOffset()),
 		})
-	for key := range result.Votes {
+	for key, _ := range result.Votes {
 		r := result.Votes[key].Protobuf()
 		resp.Votes = append(resp.Votes, &r)
 	}
@@ -182,9 +176,8 @@ func (s *server) GetKeys(
 	if fps == nil {
 		fps = &pb.Fingerprints{}
 	}
-	var apiFps []api.Fingerprint
-
-	for key := range fps.Fingerprints {
+	apiFps := []api.Fingerprint{}
+	for key, _ := range fps.Fingerprints {
 		apiFps = append(apiFps, api.Fingerprint(fps.Fingerprints[key]))
 	}
 	apiStart := api.Timestamp(start)
@@ -196,7 +189,7 @@ func (s *server) GetKeys(
 		Key_Name:            req.GetFilters().GetGraphFilters().GetName(),
 	}
 	result, _ := persistence.Read("keys", apiFps, []string{}, apiStart, apiEnd, true, &opts)
-	for key := range result.Keys {
+	for key, _ := range result.Keys {
 		r := result.Keys[key].Protobuf()
 		resp.Keys = append(resp.Keys, &r)
 	}
@@ -215,9 +208,8 @@ func (s *server) GetTruststates(
 	start := api.Timestamp(req.GetFilters().GetLastRefTimeRange().GetStart())
 	end := api.Timestamp(req.GetFilters().GetLastRefTimeRange().GetEnd())
 	fps := req.GetFilters().GetFingerprints().GetFingerprints()
-	var apiFps []api.Fingerprint
-
-	for key := range fps {
+	apiFps := []api.Fingerprint{}
+	for key, _ := range fps {
 		apiFps = append(apiFps, api.Fingerprint(fps[key]))
 	}
 	result, _ := persistence.Read("truststates", apiFps, []string{}, start, end, true,
@@ -230,7 +222,7 @@ func (s *server) GetTruststates(
 			AllProvables_Limit:   int(req.GetFilters().GetGraphFilters().GetLimit()),
 			AllProvables_Offset:  int(req.GetFilters().GetGraphFilters().GetOffset()),
 		})
-	for key := range result.Truststates {
+	for key, _ := range result.Truststates {
 		r := result.Truststates[key].Protobuf()
 		resp.Truststates = append(resp.Truststates, &r)
 	}
@@ -298,10 +290,9 @@ func (s *server) SendMintedContent(
 		resp.Status.StatusCode = 401 // HTTP 401 Unauthorised
 		return &resp, nil
 	}
-	var allItems []interface{}
-
+	allItems := []interface{}{}
 	boardsProto := req.GetBoards()
-	for k := range boardsProto {
+	for k, _ := range boardsProto {
 		e := api.Board{}
 		e.FillFromProtobuf(*boardsProto[k])
 		err2 := api.Verify(api.Provable(&e))
@@ -313,7 +304,7 @@ func (s *server) SendMintedContent(
 		allItems = append(allItems, interface{}(e))
 	}
 	threadsProto := req.GetThreads()
-	for k := range threadsProto {
+	for k, _ := range threadsProto {
 		e := api.Thread{}
 		e.FillFromProtobuf(*threadsProto[k])
 		err2 := api.Verify(api.Provable(&e))
@@ -325,7 +316,7 @@ func (s *server) SendMintedContent(
 		allItems = append(allItems, interface{}(e))
 	}
 	postsProto := req.GetPosts()
-	for k := range postsProto {
+	for k, _ := range postsProto {
 		e := api.Post{}
 		e.FillFromProtobuf(*postsProto[k])
 		err2 := api.Verify(api.Provable(&e))
@@ -337,7 +328,7 @@ func (s *server) SendMintedContent(
 		allItems = append(allItems, interface{}(e))
 	}
 	votesProto := req.GetVotes()
-	for k := range votesProto {
+	for k, _ := range votesProto {
 		e := api.Vote{}
 		e.FillFromProtobuf(*votesProto[k])
 		err2 := api.Verify(api.Provable(&e))
@@ -349,7 +340,7 @@ func (s *server) SendMintedContent(
 		allItems = append(allItems, interface{}(e))
 	}
 	keysProto := req.GetKeys()
-	for k := range keysProto {
+	for k, _ := range keysProto {
 		e := api.Key{}
 		e.FillFromProtobuf(*keysProto[k])
 		err2 := api.Verify(api.Provable(&e))
@@ -361,7 +352,7 @@ func (s *server) SendMintedContent(
 		allItems = append(allItems, interface{}(e))
 	}
 	truststatesProto := req.GetTruststates()
-	for k := range truststatesProto {
+	for k, _ := range truststatesProto {
 		e := api.Truststate{}
 		e.FillFromProtobuf(*truststatesProto[k])
 		err2 := api.Verify(api.Provable(&e))

aether-core/aether/backend/cmd/orchestrate.go

@@ -10,17 +10,14 @@ import (
 	"aether-core/aether/services/globals"
 	"aether-core/aether/services/logging"
 	"aether-core/aether/services/scheduling"
-
 	// "github.com/fatih/color"
 	// "aether-core/aether/services/ports"
 	"encoding/json"
 	"fmt"
-
 	// "github.com/davecgh/go-spew/spew"
+	"github.com/spf13/cobra"
 	"io/ioutil"
 	"time"
-
-	"github.com/spf13/cobra"
 )
 
 func init() {
@@ -134,8 +131,7 @@ func constructCallAddress(ip api.Location, port int, addrtype int) api.Address {
 func parsePlansForThisNode(planAsByte []byte) []PlanCommand {
 	// This is just JSON parsing without a backing struct. The other alternative was copying over the struct (I don't want to have a swarmtest dependency here, I can't import from there), so this is arguably cleaner.
 	// var f interface{}
-	var plancmd []PlanCommand
-
+	plancmd := []PlanCommand{}
 	err2 := json.Unmarshal(planAsByte, &plancmd)
 	if err2 != nil {
 		logging.LogCrash(fmt.Sprintf("The swarm plan JSON parsing failed. Error: %s", err2))

aether-core/aether/backend/dispatch/addrscan.go

@@ -8,11 +8,9 @@ import (
 	pers "aether-core/aether/io/persistence"
 	"aether-core/aether/services/globals"
 	"aether-core/aether/services/logging"
-
 	// "aether-core/aether/services/safesleep"
 	"errors"
 	"fmt"
-
 	// "github.com/pkg/errors"
 	// "strings"
 	"aether-core/aether/services/toolbox"
@@ -31,17 +29,16 @@ func getAllAddresses(isDesc bool) ([]api.Address, error) {
 	}
 	resp, err := pers.ReadAddresses("", "", 0, 0, 0, 0, 0, 0, searchType)
 	if err != nil {
-		fmt.Errorf("getAllAddresses in AddressScanner failed.", err)
+		errors.New(fmt.Sprintf("getAllAddresses in AddressScanner failed.", err))
 	}
 	return resp, nil
 }
 
 func filterByLastSuccessfulPing(addrs []api.Address, scanStart api.Timestamp) []api.Address {
-	var live []api.Address
-
+	live := []api.Address{}
 	cutoff := api.Timestamp(time.Unix(int64(scanStart), 0).Add(-2 * time.Minute).Unix())
 	// Cutoff is 2 minutes before the threshold, because our pinger accepts a node whose last successful ping was within 2 minutes as online.
-	for key := range addrs {
+	for key, _ := range addrs {
 		if addrs[key].LastSuccessfulPing >= cutoff {
 			live = append(live, addrs[key])
 		}
@@ -50,11 +47,9 @@ func filterByLastSuccessfulPing(addrs []api.Address, scanStart api.Timestamp) []
 }
 
 func filterByAddressType(addrType uint8, addrs []api.Address) ([]api.Address, []api.Address) {
-	var filteredAddrs []api.Address
-
-	var remainder []api.Address
-
-	for key := range addrs {
+	filteredAddrs := []api.Address{}
+	remainder := []api.Address{}
+	for key, _ := range addrs {
 		if addrs[key].Type == addrType {
 			filteredAddrs = append(filteredAddrs, addrs[key])
 		} else {
@@ -79,7 +74,7 @@ func updateAddrs(addrs []api.Address) ([]api.Address, error) {
 	updatedAddrs := Pinger(addrs)
 	err := pers.AddrTrustedInsert(&updatedAddrs)
 	if err != nil {
-		return []api.Address{}, fmt.Errorf("updateAddrs encountered an error in AddrTrustedInsert.", err)
+		return []api.Address{}, errors.New(fmt.Sprintf("updateAddrs encountered an error in AddrTrustedInsert.", err))
 	}
 	return updatedAddrs, nil
 }
@@ -218,7 +213,7 @@ func findOnlineNodesV2(count int, reqType, addrType int, excl *[]api.Address, re
 	logging.Logf(1, "Network scan complete within findOnlineNodes.")
 	addrs, err := getAllAddresses(true) // desc - last synced first primary, last pinged first secondary sort
 	if err != nil {
-		return []api.Address{}, fmt.Errorf("findOnlineNodes: getAllAddresses within this function failed.", err)
+		return []api.Address{}, errors.New(fmt.Sprintf("findOnlineNodes: getAllAddresses within this function failed.", err))
 	}
 	if addrType > -1 {
 		addrs, _ = filterByAddressType(uint8(addrType), addrs)
@@ -242,18 +237,17 @@ func findOnlineNodesV2(count int, reqType, addrType int, excl *[]api.Address, re
 	/*=====================================================================
 	=            Enforce exclusions for too-recently-connected            =
 	=====================================================================*/
-	var l []api.Address
-
+	l := []api.Address{}
 	if !reverse {
 		// If this is a non-reverse (normal) find online request, we use the reverse dispatcher exclusion queue.
-		for k := range liveNodes {
+		for k, _ := range liveNodes {
 			if !dpe.IsExcluded(liveNodes[k]) {
 				l = append(l, liveNodes[k])
 			}
 		}
 	} else {
 		// If this is a reverse find online request, we use the reverse dispatcher exclusion queue.
-		for k := range liveNodes {
+		for k, _ := range liveNodes {
 			if !reverseDpe.IsExcluded(liveNodes[k]) {
 				l = append(l, liveNodes[k])
 			}
@@ -269,11 +263,9 @@ func findOnlineNodesV2(count int, reqType, addrType int, excl *[]api.Address, re
 }
 
 func pickUnconnectedAddrs(addrs []api.Address) ([]api.Address, []api.Address) {
-	var nonconnecteds []api.Address
-
-	var connecteds []api.Address
-
-	for key := range addrs {
+	nonconnecteds := []api.Address{}
+	connecteds := []api.Address{}
+	for key, _ := range addrs {
 		if addrs[key].LastSuccessfulSync == 0 {
 			nonconnecteds = append(nonconnecteds, addrs[key])
 		} else {
@@ -286,7 +278,7 @@ func pickUnconnectedAddrs(addrs []api.Address) ([]api.Address, []api.Address) {
 func RefreshAddresses() error {
 	addrs, err := getAllAddresses(false) // asc - the oldest unconnected first
 	if err != nil {
-		return fmt.Errorf("RefreshAddresses: getAllAddresses within this function failed.", err)
+		return errors.New(fmt.Sprintf("RefreshAddresses: getAllAddresses within this function failed.", err))
 	}
 	updateAddrs(addrs)
 	return nil