Skip to content

Commit 785c28f

Browse files
fixup! tests
1 parent 63dac5c commit 785c28f

8 files changed

+5
-17
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
contract C layout at abi.decode(abi.encode(42), (uint)) {}
2-
// ====
3-
// stopAfter: analysis
42
// ----
53
// TypeError 6396: (21-55): The storage layout can only be specified by number literals.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
contract C layout at ~uint(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) {}
2-
// ====
3-
// stopAfter: analysis
42
// ----
53
// TypeError 6396: (21-94): The storage layout can only be specified by number literals.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
function f() {}
22
contract C layout at uint32(f.selector) {}
3-
// ====
4-
// stopAfter: analysis
53
// ----
64
// TypeError 9582: (44-54): Member "selector" not found or not visible after argument-dependent lookup in function ().

test/libsolidity/syntaxTests/storageLayoutSpecifier/layout_specification_by_function.sol

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ function f() pure returns (uint256) {
22
return 128;
33
}
44
contract C layout at f() { }
5-
// ====
6-
// stopAfter: analysis
75
// ----
86
// TypeError 1139: (77-80): The base slot of the storage layout must be a compile-time constant expression.
97
// TypeError 6396: (77-80): The storage layout can only be specified by number literals.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
contract C layout at f{gas:1000, a: 2, b: 3}() { }
2-
// ====
3-
// stopAfter: analysis
1+
function f() returns (uint) { return 1; }
2+
contract C layout at f{a: 2, b: 3}() { }
43
// ----
5-
// DeclarationError 7576: (21-22): Undeclared identifier.
4+
// TypeError 2193: (63-76): Function call options can only be set on external function calls or contract creations.

test/libsolidity/syntaxTests/storageLayoutSpecifier/layout_with_inheritance.sol

-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ contract D layout at 0xABCD is A, B { }
55
// ====
66
// stopAfter: analysis
77
// ----
8-
// TypeError 2031: (70-109): Conflicting storage layout specifications:Storage layout for base contract 'A' was also specified by another contract which derives from it.
9-
// TypeError 2031: (70-109): Conflicting storage layout specifications:Storage layout for base contract 'B' was also specified by another contract which derives from it.
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
library L layout at 42 { }
2-
// ====
3-
// stopAfter: analysis
42
// ----
53
// ParserError 2314: (10-16): Expected '{' but got identifier

test/libsolidity/syntaxTests/storageLayoutSpecifier/same_ancestor_two_contracts.sol

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
contract A {}
22
contract B is A layout at 64 {}
33
contract C is A layout at 42 {}
4+
// ====
5+
// stopAfter: analysis
46
// ----
5-
// TypeError 2031: (46-77): Conflicting storage layout specifications:Storage layout for base contract 'A' was also specified by another contract which derives from it.

0 commit comments

Comments
 (0)