add params validation to bridge message validation and add non-empty …

…authority unit test (#570)
dydxprotocol · Oct 11, 2023 · 6375de1 · 6375de1
1 parent 0a98a8d
commit 6375de1
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 23 deletions.
diff --git a/protocol/x/bridge/types/msg_update_event_params.go b/protocol/x/bridge/types/msg_update_event_params.go
@@ -1,8 +1,9 @@
 package types
 
 import (
-	errorsmod "cosmossdk.io/errors"
 	"fmt"
+
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -22,5 +23,5 @@ func (msg *MsgUpdateEventParams) ValidateBasic() error {
 			),
 		)
 	}
-	return nil
+	return msg.Params.Validate()
 }
diff --git a/protocol/x/bridge/types/msg_update_event_params_test.go b/protocol/x/bridge/types/msg_update_event_params_test.go
@@ -24,7 +24,7 @@ func TestMsgUpdateEventParams_GetSigners(t *testing.T) {
 func TestMsgUpdateEventParams_ValidateBasic(t *testing.T) {
 	tests := map[string]struct {
 		msg         types.MsgUpdateEventParams
-		expectedErr error
+		expectedErr string
 	}{
 		"Success": {
 			msg: types.MsgUpdateEventParams{
@@ -36,21 +36,49 @@ func TestMsgUpdateEventParams_ValidateBasic(t *testing.T) {
 				},
 			},
 		},
-		"Failure: Invalid authority": {
+		"Failure: invalid Denom param": {
+			msg: types.MsgUpdateEventParams{
+				Authority: validAuthority,
+				Params: types.EventParams{
+					Denom:      "2test-denom", // cannot start with number
+					EthChainId: 0,
+					EthAddress: "test",
+				},
+			},
+			expectedErr: "invalid denom",
+		},
+		"Failure: invalid EthAddress param": {
+			msg: types.MsgUpdateEventParams{
+				Authority: validAuthority,
+				Params: types.EventParams{
+					Denom:      "test-denom",
+					EthChainId: 0,
+					EthAddress: "", // cannot be empty
+				},
+			},
+			expectedErr: types.ErrInvalidEthAddress.Error(),
+		},
+		"Failure: empty authority": {
 			msg: types.MsgUpdateEventParams{
 				Authority: "",
 			},
-			expectedErr: types.ErrInvalidAuthority,
+			expectedErr: types.ErrInvalidAuthority.Error(),
+		},
+		"Failure: invalid authority": {
+			msg: types.MsgUpdateEventParams{
+				Authority: "dydx1abc",
+			},
+			expectedErr: types.ErrInvalidAuthority.Error(),
 		},
 	}
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			err := tc.msg.ValidateBasic()
-			if tc.expectedErr == nil {
+			if tc.expectedErr == "" {
 				require.NoError(t, err)
 			} else {
-				require.ErrorIs(t, err, tc.expectedErr)
+				require.ErrorContains(t, err, tc.expectedErr)
 			}
 		})
 	}

diff --git a/protocol/x/bridge/types/msg_update_propose_params.go b/protocol/x/bridge/types/msg_update_propose_params.go
@@ -1,8 +1,9 @@
 package types
 
 import (
-	errorsmod "cosmossdk.io/errors"
 	"fmt"
+
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -22,5 +23,5 @@ func (msg *MsgUpdateProposeParams) ValidateBasic() error {
 			),
 		)
 	}
-	return nil
+	return msg.Params.Validate()
 }
diff --git a/protocol/x/bridge/types/msg_update_propose_params_test.go b/protocol/x/bridge/types/msg_update_propose_params_test.go
@@ -2,6 +2,7 @@ package types_test
 
 import (
 	"testing"
+	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/dydxprotocol/v4-chain/protocol/testutil/constants"
@@ -19,34 +20,76 @@ func TestMsgUpdateProposeParams_GetSigners(t *testing.T) {
 func TestMsgUpdateProposeParams_ValidateBasic(t *testing.T) {
 	tests := map[string]struct {
 		msg         types.MsgUpdateProposeParams
-		expectedErr error
+		expectedErr string
 	}{
 		"Success": {
 			msg: types.MsgUpdateProposeParams{
 				Authority: validAuthority,
 				Params: types.ProposeParams{
 					MaxBridgesPerBlock:           5,
-					ProposeDelayDuration:         10_000,
+					ProposeDelayDuration:         time.Second,
 					SkipRatePpm:                  800_000,
-					SkipIfBlockDelayedByDuration: 5_000,
+					SkipIfBlockDelayedByDuration: time.Minute,
 				},
 			},
 		},
-		"Failure: Invalid authority": {
+		"Failure: negative propose delay duration": {
+			msg: types.MsgUpdateProposeParams{
+				Authority: validAuthority,
+				Params: types.ProposeParams{
+					MaxBridgesPerBlock:           5,
+					ProposeDelayDuration:         -time.Second,
+					SkipRatePpm:                  800_000,
+					SkipIfBlockDelayedByDuration: time.Minute,
+				},
+			},
+			expectedErr: types.ErrNegativeDuration.Error(),
+		},
+		"Failure: negative skip if blocked delayed by duration": {
+			msg: types.MsgUpdateProposeParams{
+				Authority: validAuthority,
+				Params: types.ProposeParams{
+					MaxBridgesPerBlock:           5,
+					ProposeDelayDuration:         time.Second,
+					SkipRatePpm:                  800_000,
+					SkipIfBlockDelayedByDuration: -time.Minute,
+				},
+			},
+			expectedErr: types.ErrNegativeDuration.Error(),
+		},
+		"Failure: out-of-bound skip rate ppm": {
+			msg: types.MsgUpdateProposeParams{
+				Authority: validAuthority,
+				Params: types.ProposeParams{
+					MaxBridgesPerBlock:           5,
+					ProposeDelayDuration:         time.Second,
+					SkipRatePpm:                  1_000_001,
+					SkipIfBlockDelayedByDuration: time.Minute,
+				},
+			},
+			expectedErr: types.ErrRateOutOfBounds.Error(),
+		},
+		"Failure: empty authority": {
 			msg: types.MsgUpdateProposeParams{
 				Authority: "",
 			},
-			expectedErr: types.ErrInvalidAuthority,
+			expectedErr: types.ErrInvalidAuthority.Error(),
+		},
+		"Failure: invalid authority": {
+			msg: types.MsgUpdateProposeParams{
+				Authority: "dydx1abc",
+			},
+			expectedErr: types.ErrInvalidAuthority.Error(),
 		},
 	}
 
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			err := tc.msg.ValidateBasic()
-			if tc.expectedErr == nil {
+			if tc.expectedErr == "" {
 				require.NoError(t, err)
 			} else {
-				require.ErrorIs(t, err, tc.expectedErr)
+				require.ErrorContains(t, err, tc.expectedErr)
 			}
 		})
 	}

diff --git a/protocol/x/bridge/types/msg_update_safety_params.go b/protocol/x/bridge/types/msg_update_safety_params.go
@@ -1,8 +1,9 @@
 package types
 
 import (
-	errorsmod "cosmossdk.io/errors"
 	"fmt"
+
+	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -22,5 +23,5 @@ func (msg *MsgUpdateSafetyParams) ValidateBasic() error {
 			),
 		)
 	}
-	return nil
+	return msg.Params.Validate()
 }
diff --git a/protocol/x/bridge/types/msg_update_safety_params_test.go b/protocol/x/bridge/types/msg_update_safety_params_test.go
@@ -19,7 +19,7 @@ func TestMsgUpdateSafetyParams_GetSigners(t *testing.T) {
 func TestMsgUpdateSafetyParams_ValidateBasic(t *testing.T) {
 	tests := map[string]struct {
 		msg         types.MsgUpdateSafetyParams
-		expectedErr error
+		expectedErr string
 	}{
 		"Success": {
 			msg: types.MsgUpdateSafetyParams{
@@ -30,20 +30,27 @@ func TestMsgUpdateSafetyParams_ValidateBasic(t *testing.T) {
 				},
 			},
 		},
-		"Failure: Invalid authority": {
+		"Failure: empty authority": {
 			msg: types.MsgUpdateSafetyParams{
 				Authority: "",
 			},
-			expectedErr: types.ErrInvalidAuthority,
+			expectedErr: types.ErrInvalidAuthority.Error(),
+		},
+		"Failure: invalid authority": {
+			msg: types.MsgUpdateSafetyParams{
+				Authority: "dydx1abc",
+			},
+			expectedErr: types.ErrInvalidAuthority.Error(),
 		},
 	}
+
 	for name, tc := range tests {
 		t.Run(name, func(t *testing.T) {
 			err := tc.msg.ValidateBasic()
-			if tc.expectedErr == nil {
+			if tc.expectedErr == "" {
 				require.NoError(t, err)
 			} else {
-				require.ErrorIs(t, err, tc.expectedErr)
+				require.ErrorContains(t, err, tc.expectedErr)
 			}
 		})
 	}