QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Fix the tests after changing address to ord

Browse Source
This commit is contained in:
Gaith Hallak 2022-06-19 21:07:41 +04:00
parent fc2875965e
commit 4562a7166c
2 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/aeso_compiler_tests.erl
View File

@ -814,8 +814,6 @@ failing_contracts() ->
"The type variable `'b` is constrained but never used">>, "The type variable `'b` is constrained but never used">>,
<<?Pos(29,41) <<?Pos(29,41)
"Unknown constraint `foo` used on the type variable `'a`">>, "Unknown constraint `foo` used on the type variable `'a`">>,
<<?Pos(60,56)
"Values of type `address` are not comparable by inequality">>,
<<?Pos(63,58) <<?Pos(63,58)
"Values of type `Chain.ttl` are not comparable by inequality">>, "Values of type `Chain.ttl` are not comparable by inequality">>,
<<?Pos(66,45) <<?Pos(66,45)
@ -824,14 +822,14 @@ failing_contracts() ->
"Values of type `(int, char) => bool` are not comparable by inequality">>, "Values of type `(int, char) => bool` are not comparable by inequality">>,
<<?Pos(74,47) <<?Pos(74,47)
"Values of type `(int, char) => bool` are not comparable by equality">>, "Values of type `(int, char) => bool` are not comparable by equality">>,
<<?Pos(89,71) <<?Pos(89,59)
"Values of type `list(address)` are not comparable by inequality">>, "Values of type `list(A)` are not comparable by inequality">>,
<<?Pos(92,77) <<?Pos(92,65)
"Values of type `option(address)` are not comparable by inequality">>, "Values of type `option(A)` are not comparable by inequality">>,
<<?Pos(95,76) <<?Pos(95,64)
"Values of type `(address * int)` are not comparable by inequality">>, "Values of type `(A * int)` are not comparable by inequality">>,
<<?Pos(96,76) <<?Pos(96,64)
"Values of type `(address * int)` are not comparable by equality">>, "Values of type `(A * int)` are not comparable by equality">>,
<<?Pos(100,68) <<?Pos(100,68)
"Values of type `list((int, char) => bool)` are not comparable by inequality">>, "Values of type `list((int, char) => bool)` are not comparable by inequality">>,
<<?Pos(101,68) <<?Pos(101,68)
@ -854,16 +852,16 @@ failing_contracts() ->
"Values of type `custom_datatype(int)` are not comparable by inequality">>, "Values of type `custom_datatype(int)` are not comparable by inequality">>,
<<?Pos(123,84) <<?Pos(123,84)
"Values of type `custom_record(int)` are not comparable by inequality">>, "Values of type `custom_record(int)` are not comparable by inequality">>,
<<?Pos(128,86) <<?Pos(128,62)
"Values of type `map(address, address)` are not comparable by inequality">>, "Values of type `map(A, A)` are not comparable by inequality">>,
<<?Pos(131,95) <<?Pos(131,71)
"Values of type `oracle(address, address)` are not comparable by inequality">>, "Values of type `oracle(A, A)` are not comparable by inequality">>,
<<?Pos(134,113) <<?Pos(134,89)
"Values of type `oracle_query(address, address)` are not comparable by inequality">>, "Values of type `oracle_query(A, A)` are not comparable by inequality">>,
<<?Pos(137,97) <<?Pos(137,85)
"Values of type `custom_datatype(address)` are not comparable by inequality">>, "Values of type `custom_datatype(A)` are not comparable by inequality">>,
<<?Pos(140,91) <<?Pos(140,79)
"Values of type `custom_record(address)` are not comparable by inequality">>, "Values of type `custom_record(A)` are not comparable by inequality">>,
<<?Pos(145,75) <<?Pos(145,75)
"Values of type `map((int, char) => bool, (int, char) => bool)` are not comparable by inequality">>, "Values of type `map((int, char) => bool, (int, char) => bool)` are not comparable by inequality">>,
<<?Pos(146,75) <<?Pos(146,75)

38
test/contracts/comparable_typevar_constraints.aes
View File

@ -55,11 +55,11 @@ main contract C =
function signature_ord(x : signature, y : signature) = x >= y // pass function signature_ord(x : signature, y : signature) = x >= y // pass
function signature_eq (x : signature, y : signature) = x == y // pass function signature_eq (x : signature, y : signature) = x == y // pass
// Eq types function address_ord(x : address, y : address) = x >= y // pass
function address_ord(x : address, y : address) = x >= y // fail
function address_eq (x : address, y : address) = x == y // pass function address_eq (x : address, y : address) = x == y // pass
// Eq types
function event_ord(x : Chain.ttl, y : Chain.ttl) = x >= y // fail function event_ord(x : Chain.ttl, y : Chain.ttl) = x >= y // fail
function event_eq (x : Chain.ttl, y : Chain.ttl) = x == y // pass function event_eq (x : Chain.ttl, y : Chain.ttl) = x == y // pass
@ -86,14 +86,14 @@ main contract C =
// Ord composite types of eq // Ord composite types of eq
function list_of_eq_ord(x : list(address), y : list(address)) = x >= y // fail function list_of_eq_ord(x : list(A), y : list(A)) = x >= y // fail
function list_of_eq_eq (x : list(address), y : list(address)) = x == y // pass function list_of_eq_eq (x : list(A), y : list(A)) = x == y // pass
function option_of_eq_ord(x : option(address), y : option(address)) = x >= y // fail function option_of_eq_ord(x : option(A), y : option(A)) = x >= y // fail
function option_of_eq_eq (x : option(address), y : option(address)) = x == y // pass function option_of_eq_eq (x : option(A), y : option(A)) = x == y // pass
function tuple_of_eq_ord(x : (address * int), y : (address * int)) = x >= y // fail function tuple_of_eq_ord(x : (A * int), y : (A * int)) = x >= y // fail
function tuple_of_eq_eq (x : (address * int), y : (address * int)) = x == y // pass function tuple_of_eq_eq (x : (A * int), y : (A * int)) = x == y // pass
// Ord composite types of nomcomparable // Ord composite types of nomcomparable
@ -125,20 +125,20 @@ main contract C =
// Eq composite types of eq // Eq composite types of eq
function map_of_eq_ord(x : map(address, address), y : map(address, address)) = x >= y // fail function map_of_eq_ord(x : map(A, A), y : map(A, A)) = x >= y // fail
function map_of_eq_eq (x : map(address, address), y : map(address, address)) = x == y // pass function map_of_eq_eq (x : map(A, A), y : map(A, A)) = x == y // pass
function oracle_of_eq_ord(x : oracle(address, address), y : oracle(address, address)) = x >= y // fail function oracle_of_eq_ord(x : oracle(A, A), y : oracle(A, A)) = x >= y // fail
function oracle_of_eq_eq (x : oracle(address, address), y : oracle(address, address)) = x == y // pass function oracle_of_eq_eq (x : oracle(A, A), y : oracle(A, A)) = x == y // pass
function oracle_query_of_eq_ord(x : oracle_query(address, address), y : oracle_query(address, address)) = x >= y // fail function oracle_query_of_eq_ord(x : oracle_query(A, A), y : oracle_query(A, A)) = x >= y // fail
function oracle_query_of_eq_eq (x : oracle_query(address, address), y : oracle_query(address, address)) = x == y // pass function oracle_query_of_eq_eq (x : oracle_query(A, A), y : oracle_query(A, A)) = x == y // pass
function datatype_of_eq_ord(x : custom_datatype(address), y : custom_datatype(address)) = x >= y // fail function datatype_of_eq_ord(x : custom_datatype(A), y : custom_datatype(A)) = x >= y // fail
function datatype_of_eq_eq (x : custom_datatype(address), y : custom_datatype(address)) = x == y // pass function datatype_of_eq_eq (x : custom_datatype(A), y : custom_datatype(A)) = x == y // pass
function record_of_eq_ord(x : custom_record(address), y : custom_record(address)) = x >= y // fail function record_of_eq_ord(x : custom_record(A), y : custom_record(A)) = x >= y // fail
function record_of_eq_eq (x : custom_record(address), y : custom_record(address)) = x == y // pass function record_of_eq_eq (x : custom_record(A), y : custom_record(A)) = x == y // pass
// Eq composite types of nomcomparable // Eq composite types of nomcomparable