cleanup tests and what not

Author: technicallyty

activities/testnet/testnet.go

@@ -312,54 +312,6 @@ func (a *Activity) LaunchTestnet(ctx context.Context, req messages.LaunchTestnet
 	return resp, nil
 }
 
-func emitHeartbeats(ctx context.Context, chain *petrichain.Chain, logger *zap.Logger) {
-	heartbeatCtx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	ticker := time.NewTicker(10 * time.Second)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-heartbeatCtx.Done():
-			return
-		case <-ticker.C:
-			validators := chain.GetValidators()
-
-			// attempts to get a heartbeat from up to 3 validators
-			success := false
-			maxValidators := 3
-			if len(validators) < maxValidators {
-				maxValidators = len(validators)
-			}
-
-			for i := 0; i < maxValidators; i++ {
-				tmClient, err := validators[i].GetTMClient(ctx)
-				if err != nil {
-					logger.Error("Failed to get TM client", zap.Error(err), zap.Int("validator", i))
-					continue
-				}
-
-				_, err = tmClient.Status(ctx)
-				if err != nil {
-					logger.Error("Chain status check failed", zap.Error(err), zap.Int("validator", i))
-					continue
-				}
-
-				success = true
-				break
-			}
-
-			if !success {
-				logger.Error("All validator checks failed", zap.Int("validators_attempted", maxValidators))
-				continue
-			}
-
-			activity.RecordHeartbeat(ctx, "Chain status: healthy")
-		}
-	}
-}
-
 func constructChainConfig(req messages.LaunchTestnetRequest,
 	chains types.Chains) (petritypes.ChainConfig, petritypes.WalletConfig) {
 	chainImage := chains[req.BaseImage]

petri/cosmos/chain/chain.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/skip-mev/ironbird/petri/cosmos/node"
 	"github.com/skip-mev/ironbird/petri/cosmos/wallet"
+	"google.golang.org/protobuf/encoding/protojson"
 
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
 	basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
@@ -878,7 +879,7 @@ func UpdateGenesisBalances(bals []Balance, data map[string]any) (map[string]any,
 	}
 
 	var bankGenesis bankv1beta1.GenesisState
-	err = json.Unmarshal(bankBytes, &bankGenesis)
+	err = protojson.Unmarshal(bankBytes, &bankGenesis)
 	if err != nil {
 		return nil, fmt.Errorf("failed to unmarshal bank genesis: %w", err)
 	}
@@ -941,7 +942,7 @@ func UpdateGenesisBalances(bals []Balance, data map[string]any) (map[string]any,
 	}
 
 	// Marshal the updated bank genesis back to JSON
-	updatedBankBytes, err := json.Marshal(bankGenesis)
+	updatedBankBytes, err := protojson.Marshal(&bankGenesis)
 	if err != nil {
 		return nil, fmt.Errorf("failed to marshal updated bank genesis: %w", err)
 	}

petri/cosmos/chain/chain_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"math/big"
 	"net/http"
 	"os"
 	"testing"
@@ -507,14 +508,19 @@ func TestSeedNodeConfigurationWithOneNode(t *testing.T) {
 	verifyPeerConfiguration(t, c.Validators[1], "validator", false, true)
 	verifyPeerConfiguration(t, c.Nodes[0], "node", false, false) // seed node should not have the seed flag set
 }
-
-func TestGenesisAlteration(t *testing.T) {
+func TestUpdateGenesisAccounts(t *testing.T) {
 	bz, err := os.ReadFile("internal/testdata/testgenesis.json")
 	require.NoError(t, err)
 
 	var data map[string]any
 	require.NoError(t, json.Unmarshal(bz, &data))
 
+	// Get original account count
+	appstate := data["app_state"].(map[string]any)
+	auth := appstate["auth"].(map[string]any)
+	originalAccounts := auth["accounts"].([]any)
+	originalCount := len(originalAccounts)
+
 	accounts := []chain.Account{
 		{
 			Type:          "/foobar",
@@ -535,14 +541,45 @@ func TestGenesisAlteration(t *testing.T) {
 	data, err = chain.UpdateGenesisAccounts(accounts, data)
 	require.NoError(t, err)
 
-	// TODO: VERIFY
+	// VERIFY: Check that accounts were added
+	updatedAppstate := data["app_state"].(map[string]any)
+	updatedAuth := updatedAppstate["auth"].(map[string]any)
+	updatedAccounts := updatedAuth["accounts"].([]any)
+
+	// Verify count increased by 2
+	require.Equal(t, originalCount+2, len(updatedAccounts))
+
+	// Verify the new accounts are present with correct data
+	lastTwoAccounts := updatedAccounts[len(updatedAccounts)-2:]
+
+	firstAccount := lastTwoAccounts[0].(map[string]any)
+	require.Equal(t, "/foobar", firstAccount["@type"])
+	require.Equal(t, "meow120", firstAccount["address"])
+	require.Equal(t, "124", firstAccount["account_number"])
+	require.Equal(t, "0", firstAccount["sequence"])
+	require.Nil(t, firstAccount["pub_key"])
+
+	secondAccount := lastTwoAccounts[1].(map[string]any)
+	require.Equal(t, "/foobar", secondAccount["@type"])
+	require.Equal(t, "meow120321", secondAccount["address"])
+	require.Equal(t, "1243", secondAccount["account_number"])
+	require.Equal(t, "0", secondAccount["sequence"])
+	require.Nil(t, secondAccount["pub_key"])
 }
 func TestGenesisAlteration_Balance(t *testing.T) {
 	bz, err := os.ReadFile("internal/testdata/testgenesis.json")
 	require.NoError(t, err)
 	var data map[string]any
 	require.NoError(t, json.Unmarshal(bz, &data))
 
+	// Get original balances and supply
+	appstate := data["app_state"].(map[string]any)
+	bank := appstate["bank"].(map[string]any)
+	originalBalances := bank["balances"].([]any)
+	originalSupply := bank["supply"].([]any)
+	originalBalanceCount := len(originalBalances)
+	originalSupplyCount := len(originalSupply)
+
 	accounts := []chain.Balance{
 		{
 			Address: "cosmosfoo",
@@ -557,5 +594,52 @@ func TestGenesisAlteration_Balance(t *testing.T) {
 	data, err = chain.UpdateGenesisBalances(accounts, data)
 	require.NoError(t, err)
 
-	// TODO: VERIFY
+	// VERIFY: Check that balances were added
+	updatedAppstate := data["app_state"].(map[string]any)
+	updatedBank := updatedAppstate["bank"].(map[string]any)
+	updatedBalances := updatedBank["balances"].([]any)
+	updatedSupply := updatedBank["supply"].([]any)
+
+	// Verify balance count increased by 2
+	require.Equal(t, originalBalanceCount+2, len(updatedBalances))
+
+	// Verify the new balances are present with correct data
+	lastTwoBalances := updatedBalances[len(updatedBalances)-2:]
+
+	firstBalance := lastTwoBalances[0].(map[string]any)
+	require.Equal(t, "cosmosfoo", firstBalance["address"])
+	firstCoins := firstBalance["coins"].([]any)
+	require.Len(t, firstCoins, 1)
+	firstCoin := firstCoins[0].(map[string]any)
+	require.Equal(t, "stake", firstCoin["denom"])
+	require.Equal(t, "100", firstCoin["amount"])
+
+	secondBalance := lastTwoBalances[1].(map[string]any)
+	require.Equal(t, "cosmosfoobar", secondBalance["address"])
+	secondCoins := secondBalance["coins"].([]any)
+	require.Len(t, secondCoins, 1)
+	secondCoin := secondCoins[0].(map[string]any)
+	require.Equal(t, "stake", secondCoin["denom"])
+	require.Equal(t, "1122100", secondCoin["amount"])
+
+	// Verify supply was updated correctly - should have added new "stake" denom
+	require.Equal(t, originalSupplyCount+1, len(updatedSupply), "supply should have one new denomination")
+
+	// Find the new stake supply entry
+	var stakeSupply *big.Int
+	found := false
+	for _, supplyItem := range updatedSupply {
+		supply := supplyItem.(map[string]any)
+		if supply["denom"].(string) == "stake" {
+			stakeSupply = new(big.Int)
+			stakeSupply.SetString(supply["amount"].(string), 10)
+			found = true
+			break
+		}
+	}
+	require.True(t, found, "stake supply should have been added to genesis")
+
+	// Verify the stake supply equals the total of added balances (100 + 1122100 = 1122200)
+	expectedTotal := big.NewInt(1122200)
+	require.Equal(t, expectedTotal.String(), stakeSupply.String())
 }