Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Validate arguments passed into cadence programs #724

Merged
merged 15 commits into from
Apr 8, 2021
Merged

Validate arguments passed into cadence programs #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
05472d4
Validate value conformance to the type
SupunS Mar 15, 2021
e4708fa
Use dynamic type instead of static type for validation
SupunS Mar 18, 2021
22d9b68
Add argument validation tests
SupunS Mar 18, 2021
4ed2842
Add licence header
SupunS Mar 19, 2021
f60ceda
Revert type name refactoring
SupunS Mar 19, 2021
8c23269
Update argument validation error
SupunS Mar 19, 2021
d0bf1cd
Fix crypto enum raw value
SupunS Mar 19, 2021
bd4155a
Refactor code
SupunS Mar 23, 2021
60dc212
Move conformance checks to the value structs
SupunS Apr 1, 2021
95b503b
Remove unused type name constants
SupunS Apr 6, 2021
1449340
Rafactor code. Rename to array 'elements' from 'members'
SupunS Apr 6, 2021
a54063b
ensure we don't forget to update the error message (again)
turbolent Apr 7, 2021
3b26bad
remove ValueConformsToSemaType and conformsToSemaType
turbolent Apr 7, 2021
7799b19
Use 'equal()' method to check numeric type equality
SupunS Apr 7, 2021
78c6188
fix typo
turbolent Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion runtime/convertValues.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ func exportCompositeValue(v *interpreter.CompositeValue, inter *interpreter.Inte
fields[i] = exportValueWithInterpreter(fieldValue, inter, results)
}

// NOTE: when modifying the cases below,
// also update the error message below!

switch staticType.Kind {
case common.CompositeKindStructure:
return cadence.NewStruct(fields).WithType(t.(*cadence.StructType))
Expand All @@ -218,6 +221,7 @@ func exportCompositeValue(v *interpreter.CompositeValue, inter *interpreter.Inte
common.CompositeKindResource.Name(),
common.CompositeKindEvent.Name(),
common.CompositeKindContract.Name(),
common.CompositeKindEnum.Name(),
},
"or",
),
Expand Down Expand Up @@ -378,7 +382,7 @@ func importValue(value cadence.Value) interpreter.Value {
}
case cadence.Enum:
return importCompositeValue(
common.CompositeKindStructure,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

common.CompositeKindEnum,
v.EnumType.Location,
v.EnumType.QualifiedIdentifier,
v.EnumType.Fields,
Expand Down
Loading