better numbers and name display in table

Author: johnuopini

config/client.go

@@ -3,6 +3,7 @@ package config
 import (
 	"embed"
 	"fmt"
+	"log"
 	"math/rand"
 	"time"
 )
@@ -66,6 +67,7 @@ func GetChainConfig(
 // ReadSpecs will read network specification from the embedded file
 func (cg *ChainConfig) ReadSpecs() ([]byte, error) {
 	if cg.NetworkSpecsVersion >= 1500 {
+		log.Printf("Loading decoder for spec 1500")
 		return networkSpecs.ReadFile(fmt.Sprintf("specs/%v.1500.json", cg.NetworkSpecs))
 	}
 	return networkSpecs.ReadFile(fmt.Sprintf("specs/%v.json", cg.NetworkSpecs))

internal/client/client.go

@@ -99,8 +99,6 @@ func NewClientWithExternalCache(cfg config.ChainConfig, cache *mcache.CacheDrive
 }
 
 func (c *Client) registerDecoder(cfg config.ChainConfig) error {
-	log.Printf("Loading decoder %v.%v", cfg.NetworkSpecs, cfg.NetworkSpecsVersion)
-	// Decoder metadata
 	var hexMetadata string
 	err := client.CallWithBlockHash(c.api.Client, &hexMetadata, "state_getMetadata", nil)
 	if err != nil {

internal/display/table.go

@@ -6,7 +6,7 @@ import (
 	"github.com/jedib0t/go-pretty/v6/text"
 	"github.com/zooper-corp/mooncli/config"
 	"github.com/zooper-corp/mooncli/internal/client"
-	"math"
+	"github.com/zooper-corp/mooncli/internal/tools"
 	"os"
 )
 
@@ -78,21 +78,19 @@ func DumpTable(data client.CollatorPool, client *client.Client, options config.T
 	revokeRound := data.RoundNumber + options.RevokeRounds
 	for _, info := range data.Collators {
 		t.AppendRow(table.Row{
-			info.DisplayName(),
+			tools.ToAscii(info.DisplayName()),
 			info.Rank,
 			info.Selected,
 			// Counted
-			fmt.Sprintf("%vK", math.Round(info.Counted.Float64()/1000)),
+			tools.Humanize(info.Counted.Float64()),
 			// Blocks
 			fmt.Sprintf("%v", info.History[data.RoundNumber].Blocks),
 			fmt.Sprintf("%.1f", info.AverageBlocks()),
 			// Balance
-			fmt.Sprintf("%v", math.Round(info.Balance.Free.Float64())),
+			tools.Humanize(info.Balance.Free.Float64()),
 			// Revokes
-			fmt.Sprintf("%vK", math.Round(info.RevokeAt(revokeRound).Counted.Float64()/1000)),
-			fmt.Sprintf("%vK", math.Round(
-				(info.Counted.Float64()-info.RevokeAt(revokeRound).Counted.Float64())/1000),
-			),
+			tools.Humanize(info.RevokeAt(revokeRound).Counted.Float64()),
+			tools.Humanize(info.Counted.Float64() - info.RevokeAt(revokeRound).Counted.Float64()),
 			fmt.Sprintf("%v", info.Revokes[revokeRound].Rank),
 		})
 	}

internal/tools/math.go

@@ -1,10 +1,31 @@
 package tools
 
-import "golang.org/x/exp/constraints"
+import (
+	"fmt"
+	"golang.org/x/exp/constraints"
+	"math"
+)
 
 func Min[T constraints.Ordered](a, b T) T {
 	if a < b {
 		return a
 	}
 	return b
 }
+
+func Humanize(v float64) string {
+	switch {
+	case v > math.Pow10(6):
+		return fmt.Sprintf("%.1fM", v/math.Pow10(6))
+	case v > math.Pow10(3):
+		return fmt.Sprintf("%.1fK", v/math.Pow10(3))
+	case v > math.Pow10(2):
+		return fmt.Sprintf("%.0f", v/math.Pow10(3))
+	case v == math.Round(v):
+		return fmt.Sprintf("%.0f", v)
+	case v < 1:
+		return fmt.Sprintf("%.3f", v)
+	default:
+		return fmt.Sprintf("%.1f", v)
+	}
+}

internal/tools/math_test.go

@@ -0,0 +1,29 @@
+package tools
+
+import "testing"
+
+func TestMin(t *testing.T) {
+	a := Min(123, 13)
+	if a != 13 {
+		t.Errorf("Expected '13' got '%v'", a)
+	}
+}
+
+func TestHumanize(t *testing.T) {
+	h := Humanize(123416789.123)
+	if h != "123.4M" {
+		t.Errorf("Expected '123.4M' got '%v'", h)
+	}
+	h = Humanize(123416.123)
+	if h != "123.4K" {
+		t.Errorf("Expected '123.4K' got '%v'", h)
+	}
+	h = Humanize(123.123)
+	if h != "123.1" {
+		t.Errorf("Expected '123.1' got '%v'", h)
+	}
+	h = Humanize(0.123)
+	if h != "0.123" {
+		t.Errorf("Expected '0.123' got '%v'", h)
+	}
+}

internal/tools/text.go

@@ -0,0 +1,16 @@
+package tools
+
+import (
+	"strings"
+	"unicode"
+)
+
+func ToAscii(s string) string {
+	t := strings.Map(func(r rune) rune {
+		if r > unicode.MaxASCII {
+			return -1
+		}
+		return r
+	}, s)
+	return t
+}

internal/tools/text_test.go

@@ -0,0 +1,10 @@
+package tools
+
+import "testing"
+
+func TestToAscii(t *testing.T) {
+	a := ToAscii("foo👾bar")
+	if a != "foobar" {
+		t.Errorf("Expecting 'foobar' got '%v'", a)
+	}
+}