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.

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

Revert "Remove support for importing/exporting and JSON encoding/deco… #2381

Conversation

turbolent
Copy link
Member

Reverts #2248

The Emulator actually relies on being able to export path links.

@turbolent turbolent requested a review from SupunS as a code owner March 11, 2023 01:14
@turbolent turbolent self-assigned this Mar 11, 2023
@turbolent turbolent requested a review from dsainati1 as a code owner March 11, 2023 01:14
@github-actions
Copy link

Cadence Benchstat comparison

This branch with compared with the base branch onflow:master commit 41f1c5b
The command for i in {1..N}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done was used.
Bench tests were run a total of 7 times on each branch.

Collapsed results for better readability

old.txtnew.txt
time/opdelta
CheckContractInterfaceFungibleTokenConformance-2118µs ± 0%117µs ± 0%~(p=1.000 n=1+1)
ContractInterfaceFungibleToken-239.8µs ± 0%38.8µs ± 0%~(p=1.000 n=1+1)
ExportType/composite_type-2358ns ± 0%507ns ± 0%~(p=1.000 n=1+1)
ExportType/simple_type-255.0ns ± 0%62.0ns ± 0%~(p=1.000 n=1+1)
InterpretRecursionFib-22.29ms ± 0%2.37ms ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_interpreter-21.18µs ± 0%1.19µs ± 0%~(p=1.000 n=1+1)
NewInterpreter/new_sub-interpreter-2636ns ± 0%662ns ± 0%~(p=1.000 n=1+1)
ParseArray-28.81ms ± 0%8.30ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-212.7ms ± 0%12.5ms ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-21.26ms ± 0%1.31ms ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/With_memory_metering-2216µs ± 0%192µs ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-2173µs ± 0%149µs ± 0%~(p=1.000 n=1+1)
ParseInfix-27.59µs ± 0%7.24µs ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-22.39ns ± 0%2.39ns ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/Three_levels-2137ns ± 0%139ns ± 0%~(p=1.000 n=1+1)
RuntimeResourceDictionaryValues-25.49ms ± 0%5.26ms ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-27.06µs ± 0%8.31µs ± 0%~(p=1.000 n=1+1)
SuperTypeInference/arrays-2328ns ± 0%337ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/composites-2139ns ± 0%137ns ± 0%~(p=1.000 n=1+1)
SuperTypeInference/integers-291.7ns ± 0%93.9ns ± 0%~(p=1.000 n=1+1)
ValueIsSubtypeOfSemaType-296.7ns ± 0%95.2ns ± 0%~(p=1.000 n=1+1)
 
alloc/opdelta
CheckContractInterfaceFungibleTokenConformance-248.9kB ± 0%48.9kB ± 0%~(all equal)
ContractInterfaceFungibleToken-223.2kB ± 0%23.2kB ± 0%~(all equal)
ExportType/composite_type-2136B ± 0%136B ± 0%~(all equal)
ExportType/simple_type-20.00B 0.00B ~(all equal)
InterpretRecursionFib-21.00MB ± 0%1.00MB ± 0%~(all equal)
NewInterpreter/new_interpreter-2768B ± 0%768B ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-2200B ± 0%200B ± 0%~(all equal)
ParseArray-22.81MB ± 0%2.73MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/byte_array-24.28MB ± 0%4.27MB ± 0%~(p=1.000 n=1+1)
ParseDeploy/decode_hex-2214kB ± 0%214kB ± 0%~(all equal)
ParseFungibleToken/With_memory_metering-228.9kB ± 0%28.9kB ± 0%~(p=1.000 n=1+1)
ParseFungibleToken/Without_memory_metering-228.9kB ± 0%28.9kB ± 0%~(p=1.000 n=1+1)
ParseInfix-21.91kB ± 0%1.92kB ± 0%~(p=1.000 n=1+1)
QualifiedIdentifierCreation/One_level-20.00B 0.00B ~(all equal)
QualifiedIdentifierCreation/Three_levels-264.0B ± 0%64.0B ± 0%~(all equal)
RuntimeResourceDictionaryValues-22.30MB ± 0%2.28MB ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-22.70kB ± 0%2.70kB ± 0%~(all equal)
SuperTypeInference/arrays-296.0B ± 0%96.0B ± 0%~(all equal)
SuperTypeInference/composites-20.00B 0.00B ~(all equal)
SuperTypeInference/integers-20.00B 0.00B ~(all equal)
ValueIsSubtypeOfSemaType-248.0B ± 0%48.0B ± 0%~(all equal)
 
allocs/opdelta
CheckContractInterfaceFungibleTokenConformance-2806 ± 0%806 ± 0%~(all equal)
ContractInterfaceFungibleToken-2370 ± 0%370 ± 0%~(all equal)
ExportType/composite_type-23.00 ± 0%3.00 ± 0%~(all equal)
ExportType/simple_type-20.00 0.00 ~(all equal)
InterpretRecursionFib-218.9k ± 0%18.9k ± 0%~(all equal)
NewInterpreter/new_interpreter-213.0 ± 0%13.0 ± 0%~(all equal)
NewInterpreter/new_sub-interpreter-24.00 ± 0%4.00 ± 0%~(all equal)
ParseArray-259.6k ± 0%59.6k ± 0%~(all equal)
ParseDeploy/byte_array-289.4k ± 0%89.4k ± 0%~(all equal)
ParseDeploy/decode_hex-263.0 ± 0%63.0 ± 0%~(all equal)
ParseFungibleToken/With_memory_metering-2768 ± 0%768 ± 0%~(all equal)
ParseFungibleToken/Without_memory_metering-2768 ± 0%768 ± 0%~(all equal)
ParseInfix-248.0 ± 0%48.0 ± 0%~(all equal)
QualifiedIdentifierCreation/One_level-20.00 0.00 ~(all equal)
QualifiedIdentifierCreation/Three_levels-22.00 ± 0%2.00 ± 0%~(all equal)
RuntimeResourceDictionaryValues-236.9k ± 0%36.9k ± 0%~(p=1.000 n=1+1)
RuntimeScriptNoop-243.0 ± 0%43.0 ± 0%~(all equal)
SuperTypeInference/arrays-23.00 ± 0%3.00 ± 0%~(all equal)
SuperTypeInference/composites-20.00 0.00 ~(all equal)
SuperTypeInference/integers-20.00 0.00 ~(all equal)
ValueIsSubtypeOfSemaType-21.00 ± 0%1.00 ± 0%~(all equal)
 

@codecov
Copy link

codecov bot commented Mar 11, 2023

Codecov Report

Merging #2381 (f4277a5) into master (41f1c5b) will increase coverage by 0.00%.
The diff coverage is 89.65%.

@@           Coverage Diff           @@
##           master    #2381   +/-   ##
=======================================
  Coverage   78.50%   78.51%           
=======================================
  Files         316      316           
  Lines       68471    68529   +58     
=======================================
+ Hits        53755    53807   +52     
- Misses      12918    12923    +5     
- Partials     1798     1799    +1     
Flag Coverage Δ
unittests 78.51% <89.65%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
values.go 73.76% <78.94%> (+0.10%) ⬆️
encoding/json/decode.go 88.42% <90.47%> (+0.04%) ⬆️
encoding/json/encode.go 94.52% <100.00%> (+0.10%) ⬆️
runtime/convertValues.go 82.74% <100.00%> (+0.12%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@turbolent turbolent merged commit c79f0db into master Mar 13, 2023
@turbolent turbolent deleted the revert-2248-bastian/remove-path-link-encoding-decoding-export-import branch March 13, 2023 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants