Merge pull request #152

Release v0.8.2
sentinel-official · Sep 24, 2021 · 6c3dcc8 · 6c3dcc8
2 parents fee0aca + ab651b8
commit 6c3dcc8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/x/plan/types/msg.go b/x/plan/types/msg.go
@@ -193,7 +193,7 @@ func (m *MsgRemoveNodeRequest) ValidateBasic() error {
 	if m.From == "" {
 		return errors.Wrap(ErrorInvalidFrom, "from cannot be empty")
 	}
-	if _, err := hubtypes.ProvAddressFromBech32(m.From); err != nil {
+	if _, err := sdk.AccAddressFromBech32(m.From); err != nil {
 		return errors.Wrapf(ErrorInvalidFrom, "%s", err)
 	}
 	if m.Id == 0 {

diff --git a/x/plan/types/msg_test.go b/x/plan/types/msg_test.go
@@ -477,53 +477,53 @@ func TestMsgRemoveNodeRequest_ValidateBasic(t *testing.T) {
 			true,
 		},
 		{
-			"invalid prefix address",
+			"invalid prefix from",
 			fields{
-				From: "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
+				From: "sentnode1qypqxpq9qcrsszgszyfpx9q4zct3sxfqelr5ey",
 			},
 			true,
 		},
 		{
-			"10 bytes address",
+			"10 bytes from",
 			fields{
-				From: "sentprov1qypqxpq9qcrsszgsutj8xr",
+				From: "sent1qypqxpq9qcrsszgslawd5s",
 			},
 			true,
 		},
 		{
-			"20 bytes address",
+			"20 bytes from",
 			fields{
-				From: "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From: "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 			},
 			true,
 		},
 		{
-			"30 bytes address",
+			"30 bytes from",
 			fields{
-				From: "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfqyy3zxfp9ycnjs2fsh33zgx",
+				From: "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfqyy3zxfp9ycnjs2fszvfck8",
 			},
 			true,
 		},
 		{
 			"zero id",
 			fields{
-				From: "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From: "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:   0,
 			},
 			true,
 		},
 		{
 			"positive id",
 			fields{
-				From: "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From: "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:   1000,
 			},
 			true,
 		},
 		{
 			"empty address",
 			fields{
-				From:    "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From:    "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:      1000,
 				Address: "",
 			},
@@ -532,7 +532,7 @@ func TestMsgRemoveNodeRequest_ValidateBasic(t *testing.T) {
 		{
 			"invalid address",
 			fields{
-				From:    "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From:    "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:      1000,
 				Address: "invalid",
 			},
@@ -541,7 +541,7 @@ func TestMsgRemoveNodeRequest_ValidateBasic(t *testing.T) {
 		{
 			"invalid prefix address",
 			fields{
-				From:    "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From:    "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:      1000,
 				Address: "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 			},
@@ -550,7 +550,7 @@ func TestMsgRemoveNodeRequest_ValidateBasic(t *testing.T) {
 		{
 			"10 bytes address",
 			fields{
-				From:    "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From:    "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:      1000,
 				Address: "sentnode1qypqxpq9qcrsszgse4wwrm",
 			},
@@ -559,7 +559,7 @@ func TestMsgRemoveNodeRequest_ValidateBasic(t *testing.T) {
 		{
 			"20 bytes address",
 			fields{
-				From:    "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From:    "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:      1000,
 				Address: "sentnode1qypqxpq9qcrsszgszyfpx9q4zct3sxfqelr5ey",
 			},
@@ -568,7 +568,7 @@ func TestMsgRemoveNodeRequest_ValidateBasic(t *testing.T) {
 		{
 			"30 bytes address",
 			fields{
-				From:    "sentprov1qypqxpq9qcrsszgszyfpx9q4zct3sxfq877k82",
+				From:    "sent1qypqxpq9qcrsszgszyfpx9q4zct3sxfq0fzduj",
 				Id:      1000,
 				Address: "sentnode1qypqxpq9qcrsszgszyfpx9q4zct3sxfqyy3zxfp9ycnjs2fsxqglcv",
 			},