fix 6.0

umee-network · Sep 15, 2023 · aaaf5e3 · aaaf5e3
1 parent b96b879
commit aaaf5e3
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 3 deletions.
diff --git a/x/leverage/keeper/msg_server.go b/x/leverage/keeper/msg_server.go
@@ -579,9 +579,10 @@ func (s msgServer) GovUpdateSpecialAssets(
 			for _, b := range set.Assets {
 				if a != b {
 					pair := types.SpecialAssetPair{
-						Collateral:       a,
-						Borrow:           b,
-						CollateralWeight: set.CollateralWeight,
+						Collateral:           a,
+						Borrow:               b,
+						CollateralWeight:     set.CollateralWeight,
+						LiquidationThreshold: set.LiquidationThreshold,
 					}
 					// sets or overrides (or deletes on zero collateral weight) each pair
 					if err := s.keeper.SetSpecialAssetPair(ctx, pair); err != nil {

diff --git a/x/leverage/keeper/msg_server_test.go b/x/leverage/keeper/msg_server_test.go
@@ -187,6 +187,102 @@ func (s *IntegrationTestSuite) TestUpdateRegistry() {
 	}
 }
 
+func (s *IntegrationTestSuite) TestUpdateSpecialAssets() {
+	govAccAddr := checkers.GovModuleAddr
+
+	testCases := []struct {
+		name      string
+		req       *types.MsgGovUpdateSpecialAssets
+		expectErr bool
+		errMsg    string
+	}{
+		{
+			"empty",
+			&types.MsgGovUpdateSpecialAssets{
+				Authority:   govAccAddr,
+				Description: "test",
+				Sets:        []types.SpecialAssetSet{},
+				Pairs:       []types.SpecialAssetPair{},
+			},
+			true,
+			"empty",
+		},
+		{
+			"valid set",
+			&types.MsgGovUpdateSpecialAssets{
+				Authority:   govAccAddr,
+				Description: "test",
+				Sets: []types.SpecialAssetSet{
+					{
+						Assets:               []string{"test1", "test2"},
+						CollateralWeight:     sdk.MustNewDecFromStr("0.8"),
+						LiquidationThreshold: sdk.MustNewDecFromStr("0.9"),
+					},
+				},
+				Pairs: []types.SpecialAssetPair{},
+			},
+			false,
+			"",
+		},
+		{
+			"valid pair",
+			&types.MsgGovUpdateSpecialAssets{
+				Authority:   govAccAddr,
+				Description: "test",
+				Sets:        []types.SpecialAssetSet{},
+				Pairs: []types.SpecialAssetPair{
+					{
+						Borrow:               "test1",
+						Collateral:           "test2",
+						CollateralWeight:     sdk.MustNewDecFromStr("0.8"),
+						LiquidationThreshold: sdk.MustNewDecFromStr("0.9"),
+					},
+				},
+			},
+			false,
+			"",
+		},
+		{
+			"valid set and pair",
+			&types.MsgGovUpdateSpecialAssets{
+				Authority:   govAccAddr,
+				Description: "test",
+				Sets: []types.SpecialAssetSet{
+					{
+						Assets:               []string{"test1", "test2"},
+						CollateralWeight:     sdk.MustNewDecFromStr("0.8"),
+						LiquidationThreshold: sdk.MustNewDecFromStr("0.9"),
+					},
+				},
+				Pairs: []types.SpecialAssetPair{
+					{
+						Borrow:               "test1",
+						Collateral:           "test2",
+						CollateralWeight:     sdk.MustNewDecFromStr("0.8"),
+						LiquidationThreshold: sdk.MustNewDecFromStr("0.9"),
+					},
+				},
+			},
+			false,
+			"",
+		},
+	}
+
+	for _, tc := range testCases {
+		s.Run(tc.name, func() {
+			err := tc.req.ValidateBasic()
+			if err == nil {
+				_, err = s.msgSrvr.GovUpdateSpecialAssets(s.ctx, tc.req)
+			}
+			if tc.expectErr {
+				s.Require().ErrorContains(err, tc.errMsg)
+			} else {
+				s.Require().NoError(err)
+			}
+		})
+	}
+}
+
 func (s *IntegrationTestSuite) TestMsgSupply() {
 	type testCase struct {
 		msg             string