Merge pull request #5003 from Agoric/4580-lien-tests

feat: liens properly wrap clawback vesting accounts

Author: mergify[bot]

go.mod

@@ -136,7 +136,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.33.2
 replace github.com/tendermint/tendermint => github.com/agoric-labs/tendermint v0.34.14-alpha.agoric.1
 
 // We need a fork of cosmos-sdk until all of the differences are merged.
-replace github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.45.1-alpha.agoric.2
+replace github.com/cosmos/cosmos-sdk => github.com/agoric-labs/cosmos-sdk v0.45.1-alpha.agoric.3
 
 replace github.com/cosmos/gaia/v6 => github.com/Agoric/ag0/v6 v6.0.3-alpha.agoric.1
 

go.sum

@@ -87,8 +87,8 @@ github.com/adlio/schema v1.1.13 h1:LeNMVg5Z1FX+Qgz8tJUijBLRdcpbFUElz+d1489On98=
 github.com/adlio/schema v1.1.13/go.mod h1:L5Z7tw+7lRK1Fnpi/LT/ooCP1elkXn0krMWBQHUhEDE=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
-github.com/agoric-labs/cosmos-sdk v0.45.1-alpha.agoric.2 h1:bffPfwAdnD/Ex0yD57Fl83tn8YnfmKdcwmwE3gCJ3A0=
-github.com/agoric-labs/cosmos-sdk v0.45.1-alpha.agoric.2/go.mod h1:0KBHbknz2rtbozxV5jkO2Xrj8hfXXlR6sFU6SpK7674=
+github.com/agoric-labs/cosmos-sdk v0.45.1-alpha.agoric.3 h1:jHBQ1UpTCRTgl3omEiXwK3DYbU7KQKl/+IDbBu2Eugo=
+github.com/agoric-labs/cosmos-sdk v0.45.1-alpha.agoric.3/go.mod h1:0KBHbknz2rtbozxV5jkO2Xrj8hfXXlR6sFU6SpK7674=
 github.com/agoric-labs/tendermint v0.34.14-alpha.agoric.1 h1:2X0lhWEPWf2k2z0ZVdTl9IhDvKX0d2kNqcsIZzaKHX8=
 github.com/agoric-labs/tendermint v0.34.14-alpha.agoric.1/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

golang/cosmos/x/lien/genesis.go

@@ -14,8 +14,16 @@ func DefaultGenesisState() types.GenesisState {
 // Since liens can apply to otherwise empty accounts and the source of truth
 // is stored at the Swingset level, we can only validate the addresses.
 func ValidateGenesis(genesisState types.GenesisState) error {
-	for _, lien := range genesisState.Liens {
-		_, err := sdk.AccAddressFromBech32(lien.Address)
+	for _, accountLien := range genesisState.Liens {
+		_, err := sdk.AccAddressFromBech32(accountLien.Address)
+		if err != nil {
+			return err
+		}
+		err = accountLien.Lien.Coins.Validate()
+		if err != nil {
+			return err
+		}
+		err = accountLien.Lien.Delegated.Validate()
 		if err != nil {
 			return err
 		}

golang/cosmos/x/lien/genesis_test.go

@@ -2,6 +2,22 @@ package lien
 
 import (
 	"testing"
+
+	"github.com/Agoric/agoric-sdk/golang/cosmos/x/lien/types"
+
+	"github.com/cosmos/cosmos-sdk/testutil/testdata"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+)
+
+func mkcoin(denom string) func(int64) sdk.Coin {
+	return func(amt int64) sdk.Coin { return sdk.NewInt64Coin(denom, amt) }
+}
+
+var (
+	ubld  = mkcoin("ubld")
+	urun  = mkcoin("urun")
+	inval = func(amt int64) sdk.Coin { return sdk.Coin{Denom: "x", Amount: sdk.NewInt(amt)} }
+	coins = sdk.NewCoins
 )
 
 func TestDefaultGenesis(t *testing.T) {
@@ -10,3 +26,76 @@ func TestDefaultGenesis(t *testing.T) {
 		t.Errorf("DefaultGenesisState did not validate %v: %e", defaultGenesisState, err)
 	}
 }
+
+func TestValidateGenesis(t *testing.T) {
+	_, _, addr1 := testdata.KeyTestPubAddr()
+	_, _, addr2 := testdata.KeyTestPubAddr()
+	for _, tt := range []struct {
+		name  string
+		state types.GenesisState
+		fail  bool
+	}{
+		{
+			name:  "empty",
+			state: types.GenesisState{},
+		},
+		{
+			name: "typical",
+			state: types.GenesisState{
+				Liens: []types.AccountLien{
+					{Address: addr1.String(), Lien: &types.Lien{
+						Coins:     coins(ubld(123)),
+						Delegated: coins(ubld(456)),
+					}},
+					{Address: addr2.String(), Lien: &types.Lien{
+						Coins:     coins(ubld(246), urun(135)),
+						Delegated: coins(),
+					}},
+				},
+			},
+		},
+		{
+			name: "bad addr",
+			state: types.GenesisState{
+				Liens: []types.AccountLien{
+					{Address: "x", Lien: &types.Lien{}},
+				},
+			},
+			fail: true,
+		},
+		{
+			name: "bad coins",
+			state: types.GenesisState{
+				Liens: []types.AccountLien{
+					{
+						Address: addr1.String(),
+						Lien:    &types.Lien{Coins: []sdk.Coin{inval(6)}},
+					},
+				},
+			},
+			fail: true,
+		},
+		{
+			name: "bad delegated",
+			state: types.GenesisState{
+				Liens: []types.AccountLien{
+					{
+						Address: addr2.String(),
+						Lien:    &types.Lien{Delegated: []sdk.Coin{inval(6)}},
+					},
+				},
+			},
+			fail: true,
+		},
+	} {
+		t.Run(tt.name, func(t *testing.T) {
+			err := ValidateGenesis(tt.state)
+			switch {
+			case err != nil && !tt.fail:
+				t.Errorf("invalid genesis state %v: %v", tt.state, err)
+			case err == nil && tt.fail:
+				t.Errorf("expected invalid genesis %v", tt.state)
+			}
+		})
+	}
+}