refactor: view transitions

Dockerfile

@@ -21,6 +21,8 @@ ADD .docker/start_fast_catchup.sh /node/run/start_fast_catchup.sh
 
 COPY --from=BUILDER /app/bin/algorun /bin/algorun
 
+RUN apt-get update && apt-get install jq -y
+
 ENTRYPOINT /node/run/start_dev.sh
 CMD []
 

cmd/root.go

@@ -52,14 +52,15 @@ var (
 			client, err := getClient()
 			cobra.CheckErr(err)
 
-			partkeys, err := internal.GetPartKeys(context.Background(), client)
+			ctx := context.Background()
+			partkeys, err := internal.GetPartKeys(ctx, client)
 			if err != nil {
 				return fmt.Errorf(
 					style.Red.Render("failed to get participation keys: %s"),
 					err)
 			}
-
 			state := internal.StateModel{
+				Offset: viper.GetInt("offset"),
 				Status: internal.StatusModel{
 					State:       "INITIALIZING",
 					Version:     "NA",
@@ -75,14 +76,17 @@ var (
 					TX:        0,
 				},
 				ParticipationKeys: partkeys,
+
+				Client:  client,
+				Context: ctx,
 			}
 			state.Accounts = internal.AccountsFromState(&state, new(internal.Clock), client)
 
 			// Fetch current state
-			err = state.Status.Fetch(context.Background(), client)
+			err = state.Status.Fetch(ctx, client, new(internal.HttpPkg))
 			cobra.CheckErr(err)
 
-			m, err := ui.MakeViewportViewModel(&state, client)
+			m, err := ui.NewViewportViewModel(&state, client)
 			cobra.CheckErr(err)
 
 			p := tea.NewProgram(
@@ -99,12 +103,9 @@ var (
 						p.Send(state)
 						p.Send(err)
 					}
-				}, context.Background(), client)
+				}, ctx, client)
 			}()
 			_, err = p.Run()
-			//for {
-			//	time.Sleep(10 * time.Second)
-			//}
 			return err
 		},
 	}

cmd/status.go

@@ -44,7 +44,7 @@
 			},
 			ParticipationKeys: nil,
 		}
-		err = state.Status.Fetch(context.Background(), client)
+		err = state.Status.Fetch(context.Background(), client, new(internal.HttpPkg))
 		cobra.CheckErr(err)
 		// Create the TUI
 		view := ui.MakeStatusViewModel(&state)

internal/accounts.go

@@ -13,6 +13,7 @@
 
 // Account represents a user's account, including address, status, balance, and number of keys.
 type Account struct {
+	Participation *api.AccountParticipation
 	// Account Address is the algorand encoded address
 	Address string
 	// Status is the Online/Offline/"NotParticipating" status of the account
@@ -28,7 +29,7 @@
 }
 
 // Gets the list of addresses created at genesis from the genesis file
-func getAddressesFromGenesis(client *api.ClientWithResponses) ([]string, string, string, error) {
+func getAddressesFromGenesis(client api.ClientInterface) ([]string, string, string, error) {
 	resp, err := client.GetGenesis(context.Background())
 	if err != nil {
 		return []string{}, "", "", err
@@ -91,7 +92,7 @@
 }
 
 // Get Online Status of Account
-func GetAccount(client *api.ClientWithResponses, address string) (api.Account, error) {
+func GetAccount(client api.ClientWithResponsesInterface, address string) (api.Account, error) {
 	var format api.AccountInformationParamsFormat = "json"
 	r, err := client.AccountInformationWithResponse(
 		context.Background(),
@@ -112,8 +113,19 @@
 	return *r.JSON200, nil
 }
 
+func GetExpiresTime(t Time, key api.ParticipationKey, state *StateModel) time.Time {
+	now := t.Now()
+	var expires = now.Add(-(time.Hour * 24 * 365 * 100))
+	if key.LastBlockProposal != nil && state.Status.LastRound != 0 && state.Metrics.RoundTime != 0 {
+		roundDiff := max(0, *key.EffectiveLastValid-int(state.Status.LastRound))
+		distance := int(state.Metrics.RoundTime) * roundDiff
+		expires = now.Add(time.Duration(distance))
+	}
+	return expires
+}
+
 // AccountsFromParticipationKeys maps an array of api.ParticipationKey to a keyed map of Account
-func AccountsFromState(state *StateModel, t Time, client *api.ClientWithResponses) map[string]Account {
+func AccountsFromState(state *StateModel, t Time, client api.ClientWithResponsesInterface) map[string]Account {
 	values := make(map[string]Account)
 	if state == nil || state.ParticipationKeys == nil {
 		return values
@@ -126,7 +138,7 @@
 				Status:  "Unknown",
 				Amount:  0,
 			}
-			if state.Status.State != "SYNCING" {
+			if state.Status.State != SyncingState {
 				var err error
 				account, err = GetAccount(client, key.Address)
 				// TODO: handle error
@@ -135,23 +147,24 @@
 					panic(err)
 				}
 			}
-			now := t.Now()
-			var expires = now.Add(-(time.Hour * 24 * 365 * 100))
-			if key.EffectiveLastValid != nil {
-				roundDiff := max(0, *key.EffectiveLastValid-int(state.Status.LastRound))
-				distance := int(state.Metrics.RoundTime) * roundDiff
-				expires = now.Add(time.Duration(distance))
-			}
 
 			values[key.Address] = Account{
-				Address: key.Address,
-				Status:  account.Status,
-				Balance: account.Amount / 1000000,
-				Expires: expires,
-				Keys:    1,
+				Participation: account.Participation,
+				Address:       key.Address,
+				Status:        account.Status,
+				Balance:       account.Amount / 1000000,
+				Expires:       GetExpiresTime(t, key, state),
+				Keys:          1,
 			}
 		} else {
 			val.Keys++
+			if val.Expires.Before(t.Now()) {
+				now := t.Now()
+				var expires = GetExpiresTime(t, key, state)
+				if !expires.Before(now) {
+					val.Expires = expires
+				}
+			}
 			values[key.Address] = val
 		}
 	}

internal/accounts_test.go

@@ -2,16 +2,13 @@ package internal
 
 import (
 	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/hack-tui/internal/test/mock"
 	"github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
 )
 
-type TestClock struct{}
-
-func (TestClock) Now() time.Time { return time.Time{} }
-
 func Test_AccountsFromState(t *testing.T) {
 
 	// Setup elevated client
@@ -67,7 +64,7 @@ func Test_AccountsFromState(t *testing.T) {
 
 	effectiveFirstValid := 0
 	effectiveLastValid := 10000
-
+	lastProposedRound := 1336
 	// Create mockedPart Keys
 	var mockedPartKeys = []api.ParticipationKey{
 		{
@@ -83,7 +80,7 @@ func Test_AccountsFromState(t *testing.T) {
 				VoteLastValid:             9999999,
 				VoteKeyDilution:           0,
 			},
-			LastBlockProposal: nil,
+			LastBlockProposal: &lastProposedRound,
 			LastStateProof:    nil,
 			LastVote:          nil,
 		},
@@ -117,7 +114,7 @@ func Test_AccountsFromState(t *testing.T) {
 				VoteLastValid:             9999999,
 				VoteKeyDilution:           0,
 			},
-			LastBlockProposal: nil,
+			LastBlockProposal: &lastProposedRound,
 			LastStateProof:    nil,
 			LastVote:          nil,
 		},
@@ -145,7 +142,7 @@ func Test_AccountsFromState(t *testing.T) {
 	}
 
 	// Calculate expiration
-	clock := new(TestClock)
+	clock := new(mock.Clock)
 	now := clock.Now()
 	roundDiff := max(0, effectiveLastValid-int(state.Status.LastRound))
 	distance := int(state.Metrics.RoundTime) * roundDiff
@@ -154,18 +151,20 @@ func Test_AccountsFromState(t *testing.T) {
 	// Construct expected accounts
 	expectedAccounts := map[string]Account{
 		onlineAccounts[0].Address: {
-			Address: onlineAccounts[0].Address,
-			Status:  onlineAccounts[0].Status,
-			Balance: onlineAccounts[0].Amount / 1_000_000,
-			Keys:    2,
-			Expires: expires,
+			Participation: onlineAccounts[0].Participation,
+			Address:       onlineAccounts[0].Address,
+			Status:        onlineAccounts[0].Status,
+			Balance:       onlineAccounts[0].Amount / 1_000_000,
+			Keys:          2,
+			Expires:       expires,
 		},
 		onlineAccounts[1].Address: {
-			Address: onlineAccounts[1].Address,
-			Status:  onlineAccounts[1].Status,
-			Balance: onlineAccounts[1].Amount / 1_000_000,
-			Keys:    1,
-			Expires: expires,
+			Participation: onlineAccounts[1].Participation,
+			Address:       onlineAccounts[1].Address,
+			Status:        onlineAccounts[1].Status,
+			Balance:       onlineAccounts[1].Amount / 1_000_000,
+			Keys:          1,
+			Expires:       expires,
 		},
 	}
 

internal/block.go

@@ -12,7 +12,7 @@ type BlockMetrics struct {
 	TPS     float64
 }
 
-func GetBlockMetrics(ctx context.Context, client *api.ClientWithResponses, round uint64, window int) (*BlockMetrics, error) {
+func GetBlockMetrics(ctx context.Context, client api.ClientWithResponsesInterface, round uint64, window int) (*BlockMetrics, error) {
 	var avgs = BlockMetrics{
 		AvgTime: 0,
 		TPS:     0,

internal/github.go

@@ -2,12 +2,10 @@ package internal
 
 import (
 	"encoding/json"
-	"log"
-	"net/http"
 	"strings"
 )
 
-func GetGoAlgorandRelease(channel string) (*string, error) {
+func GetGoAlgorandRelease(channel string, http HttpPkgInterface) (*string, error) {
 	resp, err := http.Get("https://api.github.com/repos/algorand/go-algorand/releases")
 	if err != nil {
 		return nil, err
@@ -16,7 +14,7 @@ func GetGoAlgorandRelease(channel string) (*string, error) {
 	defer resp.Body.Close()
 	var versions []map[string]interface{}
 	if err := json.NewDecoder(resp.Body).Decode(&versions); err != nil {
-		log.Fatal("ooopsss! an error occurred, please try again")
+		return nil, err
 	}
 	var versionResponse *string
 	for i := range versions {

internal/github_test.go

@@ -0,0 +1,82 @@
+package internal
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"net/http"
+	"testing"
+)
+
+type testDecoder struct {
+	HttpPkgInterface
+}
+
+func (testDecoder) Get(url string) (resp *http.Response, err error) {
+	return &http.Response{
+		Status:           "",
+		StatusCode:       0,
+		Proto:            "",
+		ProtoMajor:       0,
+		ProtoMinor:       0,
+		Header:           nil,
+		Body:             http.NoBody,
+		ContentLength:    0,
+		TransferEncoding: nil,
+		Close:            false,
+		Uncompressed:     false,
+		Trailer:          nil,
+		Request:          nil,
+		TLS:              nil,
+	}, nil
+}
+
+type testResponse struct {
+	HttpPkgInterface
+}
+
+var jsonStr = `[{
+    "tag_name": "v3.26.0-beta"
+  }]`
+
+func (testResponse) Get(url string) (resp *http.Response, err error) {
+
+	responseBody := io.NopCloser(bytes.NewReader([]byte(jsonStr)))
+	return &http.Response{
+		StatusCode: 200,
+		Body:       responseBody,
+	}, nil
+}
+
+type testError struct {
+	HttpPkgInterface
+}
+
+func (testError) Get(url string) (resp *http.Response, err error) {
+	return &http.Response{
+		StatusCode: 404,
+	}, errors.New("not found")
+}
+
+func Test_Github(t *testing.T) {
+	_, err := GetGoAlgorandRelease("beta", new(testDecoder))
+	if err == nil {
+		t.Error("should fail to decode")
+	}
+
+	r, err := GetGoAlgorandRelease("beta", new(testResponse))
+	if err != nil {
+		t.Error(err)
+	}
+	if r == nil {
+		t.Error("should not be nil")
+	}
+	if *r != "v3.26.0-beta" {
+		t.Error("should return v3.26.0-beta")
+	}
+
+	_, err = GetGoAlgorandRelease("beta", new(testError))
+	if err == nil {
+		t.Error("should fail to get")
+	}
+}

internal/http.go

@@ -0,0 +1,17 @@
+package internal
+
+import "net/http"
+
+type HttpPkg struct {
+	HttpPkgInterface
+}
+
+func (HttpPkg) Get(url string) (resp *http.Response, err error) {
+	return http.Get(url)
+}
+
+var Http HttpPkg
+
+type HttpPkgInterface interface {
+	Get(url string) (resp *http.Response, err error)
+}

internal/metrics.go

@@ -59,7 +59,7 @@ func parseMetricsContent(content string) (MetricsResponse, error) {
 }
 
 // GetMetrics parses the /metrics endpoint from algod into a map
-func GetMetrics(ctx context.Context, client *api.ClientWithResponses) (MetricsResponse, error) {
+func GetMetrics(ctx context.Context, client api.ClientWithResponsesInterface) (MetricsResponse, error) {
 	res, err := client.MetricsWithResponse(ctx)
 	if err != nil {
 		return nil, err