update

onflow · May 28, 2024 · b257b68 · b257b68
1 parent 465adfa
commit b257b68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/encoding/json/decode.go b/encoding/json/decode.go
@@ -1385,7 +1385,7 @@ func (d *Decoder) decodeCapability(valueJSON any) cadence.Capability {
 		}
 	} else {
 		if _, hasKey := obj[pathKey]; hasKey {
-			panic("invalid capability: path is not supported")
+			panic(errors.NewDefaultUserError("invalid capability: path is not supported"))
 		}
 	}
 

diff --git a/encoding/json/encoding_test.go b/encoding/json/encoding_test.go
@@ -2866,12 +2866,8 @@ func TestDecodeCapability(t *testing.T) {
 	t.Run("deprecated Path Capabliity without backwards compatability", func(t *testing.T) {
 		t.Parallel()
 
-		require.Panics(t, func() {
-
-			testDecode(
-				t,
-				// language=json
-				`
+		_, err := Decode(nil, []byte(
+			`
 			{
 			  "type": "Capability",
 			  "value": {
@@ -2889,18 +2885,10 @@ func TestDecodeCapability(t *testing.T) {
 			  }
 			}
 		  `,
-				cadence.NewDeprecatedPathCapability(
-					cadence.BytesToAddress([]byte{1, 2, 3, 4, 5}),
-					cadence.Path{
-						Domain:     common.PathDomainPublic,
-						Identifier: "foo",
-					},
-					cadence.IntType,
-				),
-			)
-		})
-	})
+		))
+		require.Error(t, err)
 
+	})
 }
 
 func TestDecodeFixedPoints(t *testing.T) {