Fix compare function for identifiers and names. #926
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anton-trunov
approved these changes
Jan 16, 2021
jjcnn
added a commit
that referenced
this pull request
Mar 25, 2021
* Create new branch * Define Address type (#763) * Define Address type * Define legal Address types for messages, parameters and fields. * Syntax for address types (#767) * Added address type to syntax, and fixed ambiguous grammar * Add location info to Address field identifiers * Type inference rules for addresses (#778) * assert_type_assignable * Use assert_type_assignable in TypeUtil. * Type inference rules for address types * Fix type_assignable and tests of same, introduce legal_procedure_parameter_type, and fix parser bug * Fix parser bug and typechecker issue * Refactor type equivalence tests * Assignable tests * Duplicate field check for address types * Remove fixed TODO * Move duplicate field check to Recursion.ml * Remove blank line * Reintroduce is_ground_type * Cosmetic change to pp_typ in case the address contains no fields * Addresses from JSONs should be read as ByStr20s * Reorder arguments to for_all2_exn in builtin argument traversal * Do not use type_assignable when comparing types derived from literal values * Use type_equiv in Schnorr calculations, and rename json_to_lit to json_to_lit_exn * Remote state read read syntax (#783) * Remote state read syntax and typechecking * _balance field must be accessible even when not declared * Change <- to <-- for remote reads * Add address type to map key and value types * Removed incorrect comment * Simple example contract for remote state reads, plus minor parser fix (#785) * Field initialiser bugs fixed (#787) * Fixed two bugs re. initialisers for address fields. * Update src/base/TypeChecker.ml Co-Authored-By: Vaivaswatha N <vaivaswatha@users.noreply.github.com> Co-authored-by: Vaivaswatha N <vaivaswatha@users.noreply.github.com> * Contract info should specify the defining lib for ADTs (#786) * Provide an external_fetch function in StateService (#805) * Add IPC methods to fetch external contract state * Provide means to specify external states via input JSONs * Add a dummy fetch_ext_state_value to StateIPCTestServer * Provide external_fetch service in StateService.ml * Fix compare function for identifiers and names. (#926) * Fix outstanding merge issues (#925) * Fix outstanding merge issues * fmt * Use assert_type_assignable rather than assert_type_equiv * fmt * `_sender` and `_this_address` are addresses (#801) * _sender is an address, eq should compare addresses as ByStr20 * Added addresses as legal ADT constructor arguments * Addresses in event fields output as ByStr20 * fmt * Missing merge file * Remote state reads practicalities (#927) * Name parameters to type_assignable and assert_type_assignable * address_typ to construct address type nodes * fmt * Allow parenthesised address types (#937) * Fetch external value IPC query cannot provide expected type as that isn't exactly known. * Allow fetching type only for remote fields * fmt * Remote state reads bugfixes (#945) * Use declared type rather than actual type in field env * Allow _this_address to be declared in address types * Disallow spids other than _this_address in address types * Remote state reads testserver (#948) * JSON parsing of external states * Add testsuite support for external states * Added remote state reads test contract * Test contract * implement remote map read * Add comment clarifying computing accessed value type * Fix issue with address types being lost * fmt Co-authored-by: Vaivaswatha Nagaraj <vaivaswatha@zilliqa.com> * Merge * Push immutable parameters via state service, along with fields * Push contract parameters to state service during migration * Revert "Push contract parameters to state service during migration" This reverts commit 2ea064c. * Revert "Push immutable parameters via state service, along with fields" This reverts commit 2cf3978. * Remote state reads dynamic typecheck (#953) * Parameter typechecker for addresses * Ignore types in init.json (not backward compatible), remove faulty assignability check for field initialisers * Dynamic typecheck of contract parameters * Missing commit of TypeUtil.mli * Dynamic typecheck of contract parameters * Minor tidying up * Comments added * Separate prepare_message from handle_message to allow for dynamic typechecks * Dynamic typecheck of transition parameters, plus some (not all) tests * Negative tests for addresses and ADTs * Remote state reads misc bugfixes (#954) * Address types are legal map value types * Fix type_assignable * Added comment about contravariance in custom ADTs * Tests of _this_address in address types and remote reads * Tests that messages, events and excetions use ByStr20 and not Address types * Forgot to add the new tests to Testcontracts.ml * Added assignability tests * Decrease sender balance on acceptance (#955) * make fmt * Do not pretty-print Lists as JSON arrays. This confuses the (#956) state parser in the blockchain unit test which cannot know if its a map or not (yet). I ended up running `make fmt` which resulted in some other changes as well, but just whitespace changes. Co-authored-by: Jacob Johannsen <jajocnn@gmail.com> * Fix missing stuff in #956 (#957) * Fix missing stuff in #956 * Change _this_address of test contract * Update owner address and balance (to cover gas fee in C++ test) * Remote state reads nonce check (#959) * Added nonce check * Tests for nonce > 0 || balance > 0 * New syntax for address types and remote state reads. (#960) * Added nonce check * Tests for nonce > 0 || balance > 0 * Changed remote read operator from <-- to <-& * Change address type syntax * Remove _this_address production from address_type_field * Remove _this_address from Address AST nodes * make fmt * Change nonce_type to Uint64 (#961) * Scilla-server wrapper for the disambiguation tool (#964) * Disambiguator should output init JSON to file (#965) * Ignore _balance output (#966) * Remote state reads checker tests (#963) * Equality tests on address types * Non-storable types not allowed in address fields. Contract parameters checked for serializability. eq tests on addresses * Address list traversal tests * Namespaces not allowed when remote reading * Polymorphic address types * Test remote read from non-address * Additional negative remote read tests * Test of deep remote reads * Various deep remote reads tests * Fix problem map builtins on maps with addresses as key types * Only address argument types to put should be converted to ByStr20 * fmt * Merge fixes * fmt * Additional tests of assignability (#962) * Fix contract parameter validation check (#969) * Disable check. Another check needs to be enabled before merging * Allow maps as contract parameters * Validate contract parameters * fmt * Fixed elaboration of to_string, strrev and to_ascii for address types (#971) * Handle migration of contracts with missing state (#972) * Handle migration of contracts with missing state * fmt * Make contract init tests aware of scilla server tests Co-authored-by: Vaivaswatha N <vaivaswatha@users.noreply.github.com> Co-authored-by: Vaivaswatha Nagaraj <vaivaswatha@zilliqa.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The old compare function for names would compare error strings as well as actual names, and the old compare function for identifiers would compare locations as well as actual identifiers.
It won't make a huge difference, but this is the correct behaviour.