From 446d15488c36ab4a26514a0254cdd25f8ca9eb33 Mon Sep 17 00:00:00 2001 From: Mathias Baumann Date: Mon, 20 Jul 2020 14:45:49 +0200 Subject: [PATCH] Update tests for new public var override rules --- ...nted_intermediate_empty_bottom_public_state_variable.sol | 3 ++- ...ented_intermediate_implemented_public_state_variable.sol | 2 +- ...d_top_implemented_intermediate_public_state_variable.sol | 2 +- .../override/public_immutable_var_overrides_pure.sol | 2 +- .../override/public_var_no_override_but_function.sol | 2 +- .../inheritance/override/public_vars_multiple.sol | 4 ++-- .../inheritance/override/public_vars_multiple1.sol | 2 +- .../inheritance/override/public_vars_multiple2.sol | 6 +++--- .../inheritance/override/public_vars_multiple3.sol | 6 +++--- .../inheritance/override/public_vars_multiple_diamond.sol | 6 +++--- .../inheritance/override/public_vars_multiple_diamond1.sol | 4 ++-- .../inheritance/override/public_vars_multiple_diamond2.sol | 4 ++-- .../override/public_vars_multiple_explicit_override.sol | 4 ++-- 13 files changed, 24 insertions(+), 23 deletions(-) diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_empty_bottom_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_empty_bottom_public_state_variable.sol index 3af8fd6e1..61c159b08 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_empty_bottom_public_state_variable.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_empty_bottom_public_state_variable.sol @@ -1,5 +1,5 @@ contract I { - function f() external pure virtual returns (uint) { return 1; } + function f() external view virtual returns (uint) { return 1; } } contract A is I { @@ -11,3 +11,4 @@ contract C is A, B { uint public override f; } +// ---- diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol index d59dade35..392b6640b 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol @@ -1,5 +1,5 @@ contract I { - function f() external pure virtual returns (uint) { return 1; } + function f() external view virtual returns (uint) { return 1; } } contract A is I { diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol index 390e763e8..5e7052a62 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol @@ -1,5 +1,5 @@ contract I { - function f() external pure virtual returns (uint) { return 1; } + function f() external view virtual returns (uint) { return 1; } } contract A is I { diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_immutable_var_overrides_pure.sol b/test/libsolidity/syntaxTests/inheritance/override/public_immutable_var_overrides_pure.sol index 1966db260..53f7170f4 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_immutable_var_overrides_pure.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_immutable_var_overrides_pure.sol @@ -5,4 +5,4 @@ contract X is C { uint public immutable override foo = 7; } // ---- -// TypeError 6959: (100-124): Overriding public state variable changes state mutability from "pure" to "view". +// TypeError 6959: (100-138): Overriding public state variable changes state mutability from "pure" to "view". diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol index 059450fe6..15b6e7b5d 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol @@ -1,5 +1,5 @@ contract A { - function foo() internal virtual pure returns(uint) { return 5; } + function foo() internal virtual view returns(uint) { return 5; } } contract X is A { uint public foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol index f0a79beb2..0222db63b 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol @@ -1,8 +1,8 @@ contract A { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract B { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract X is A, B { uint public override foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol index 719c917c7..7cba6cf0a 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol @@ -2,7 +2,7 @@ contract A { uint public foo; } contract B { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract X is A, B { uint public override foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple2.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple2.sol index fa0c17880..42c0a97f1 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple2.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple2.sol @@ -1,7 +1,7 @@ contract A { - function foo() external virtual pure returns(uint) { return 4; } - function foo(uint ) external virtual pure returns(uint) { return 4; } - function foo(uint , uint ) external pure virtual returns(A) { } + function foo() external virtual view returns(uint) { return 4; } + function foo(uint ) external virtual view returns(uint) { return 4; } + function foo(uint , uint ) external view virtual returns(A) { } } contract X is A { uint public override foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol index 1ef6cf296..35e3e78ac 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol @@ -1,7 +1,7 @@ contract A { - function foo() external virtual pure returns(A) { } - function foo(uint ) external virtual pure returns(uint) { return 4; } - function foo(uint , uint ) external pure virtual returns(A) { } + function foo() external virtual view returns(A) { } + function foo(uint ) external virtual view returns(uint) { return 4; } + function foo(uint , uint ) external view virtual returns(A) { } } contract X is A { uint public override foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol index ffac63dc8..67e95e129 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol @@ -1,11 +1,11 @@ contract A { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract B is A { - function foo() external virtual override pure returns(uint) { return 5; } + function foo() external virtual override view returns(uint) { return 5; } } contract C is A { - function foo() external virtual override pure returns(uint) { return 5; } + function foo() external virtual override view returns(uint) { return 5; } } contract X is B, C { uint public override foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol index b0b4d22fc..9830bfce7 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol @@ -1,11 +1,11 @@ contract A { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract B is A { uint public override foo; } contract C is A { - function foo() external virtual override pure returns(uint) { return 5; } + function foo() external virtual override view returns(uint) { return 5; } } contract X is B, C { uint public override foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol index f303b82cd..0ce74dc6b 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol @@ -1,11 +1,11 @@ contract A { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract B is A { uint public override foo; } contract C is A { - function foo() external virtual override pure returns(uint) { return 5; } + function foo() external virtual override view returns(uint) { return 5; } } contract X is B, C { uint public override(A, C) foo; diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_explicit_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_explicit_override.sol index caf3f9ea8..b0579b307 100644 --- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_explicit_override.sol +++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_explicit_override.sol @@ -1,8 +1,8 @@ contract A { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract B { - function foo() external virtual pure returns(uint) { return 5; } + function foo() external virtual view returns(uint) { return 5; } } contract X is A, B { uint public override(A, B) foo;