Skip to content

Commit 54ab990

Browse files
aarltaarlt
committed
Fix Tests.
1 parent 9eb87b0 commit 54ab990

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎test/libsolidity/util/SoltestTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ struct FunctionCallExpectations
198198
/// that is retained and can be displayed.
199199
std::string comment;
200200
/// An expectation can also be defined by a builtin function.
201-
std::unique_ptr<FunctionCall> builtin;
201+
std::shared_ptr<FunctionCall> builtin;
202202

203203
/// ABI encoded `bytes` of parsed expected return values. It is checked
204204
/// against the actual result of a function call when used in test framework.

‎test/libsolidity/util/TestFunctionCallTests.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(format_unsigned_singleline)
3939
bytes expectedBytes = toBigEndian(u256{1});
4040
ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
4141
Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
42-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
42+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
4343
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
4444
FunctionCall call{"f(uint8)", {0}, arguments, expectations};
4545
call.omitsArrow = false;
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(format_unsigned_singleline_signed_encoding)
5959
bytes expectedBytes = toBigEndian(u256{1});
6060
ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
6161
Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
62-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
62+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
6363
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
6464
FunctionCall call{"f(uint8)", {0}, arguments, expectations};
6565
call.omitsArrow = false;
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(format_unsigned_multiline)
7979
bytes expectedBytes = toBigEndian(u256{1});
8080
ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
8181
Parameter result{expectedBytes, "1", abiType, FormatInfo{}};
82-
FunctionCallExpectations expectations{vector<Parameter>{result}, false, string{}};
82+
FunctionCallExpectations expectations{vector<Parameter>{result}, false, string{}, {}};
8383
FunctionCallArgs arguments{vector<Parameter>{}, string{}};
8484
FunctionCall call{"f(uint8)", {0}, arguments, expectations};
8585
call.omitsArrow = false;
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE(format_multiple_unsigned_singleline)
9494
bytes expectedBytes = toBigEndian(u256{1});
9595
ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
9696
Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
97-
FunctionCallExpectations expectations{vector<Parameter>{param, param}, false, string{}};
97+
FunctionCallExpectations expectations{vector<Parameter>{param, param}, false, string{}, {}};
9898
FunctionCallArgs arguments{vector<Parameter>{param, param}, string{}};
9999
FunctionCall call{"f(uint8, uint8)", {0}, arguments, expectations};
100100
call.omitsArrow = false;
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE(format_signed_singleline)
108108
bytes expectedBytes = toBigEndian(u256{-1});
109109
ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
110110
Parameter param{expectedBytes, "-1", abiType, FormatInfo{}};
111-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
111+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
112112
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
113113
FunctionCall call{"f(int8)", {0}, arguments, expectations};
114114
call.omitsArrow = false;
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE(format_hex_singleline)
128128
bytes expectedBytes = result + bytes(32 - result.size(), 0);
129129
ABIType abiType{ABIType::Hex, ABIType::AlignRight, 32};
130130
Parameter param{expectedBytes, "0x31", abiType, FormatInfo{}};
131-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
131+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
132132
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
133133
FunctionCall call{"f(bytes32)", {0}, arguments, expectations};
134134
call.omitsArrow = false;
@@ -150,7 +150,7 @@ BOOST_AUTO_TEST_CASE(format_hex_string_singleline)
150150
bytes expectedBytes = fromHex("4200ef");
151151
ABIType abiType{ABIType::HexString, ABIType::AlignLeft, 3};
152152
Parameter param{expectedBytes, "hex\"4200ef\"", abiType, FormatInfo{}};
153-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
153+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
154154
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
155155
FunctionCall call{"f(string)", {0}, arguments, expectations};
156156
call.omitsArrow = false;
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE(format_bool_true_singleline)
164164
bytes expectedBytes = toBigEndian(u256{true});
165165
ABIType abiType{ABIType::Boolean, ABIType::AlignRight, 32};
166166
Parameter param{expectedBytes, "true", abiType, FormatInfo{}};
167-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
167+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
168168
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
169169
FunctionCall call{"f(bool)", {0}, arguments, expectations};
170170
call.omitsArrow = false;
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(format_bool_false_singleline)
185185
bytes expectedBytes = toBigEndian(u256{false});
186186
ABIType abiType{ABIType::Boolean, ABIType::AlignRight, 32};
187187
Parameter param{expectedBytes, "false", abiType, FormatInfo{}};
188-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
188+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
189189
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
190190
FunctionCall call{"f(bool)", {0}, arguments, expectations};
191191
call.omitsArrow = false;
@@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(format_bool_left_singleline)
199199
bytes expectedBytes = toBigEndian(u256{false});
200200
ABIType abiType{ABIType::Boolean, ABIType::AlignLeft, 32};
201201
Parameter param{expectedBytes, "left(false)", abiType, FormatInfo{}};
202-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
202+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
203203
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
204204
FunctionCall call{"f(bool)", {0}, arguments, expectations};
205205
call.omitsArrow = false;
@@ -214,7 +214,7 @@ BOOST_AUTO_TEST_CASE(format_hex_number_right_singleline)
214214
bytes expectedBytes = result + bytes(32 - result.size(), 0);
215215
ABIType abiType{ABIType::Hex, ABIType::AlignRight, 32};
216216
Parameter param{expectedBytes, "right(0x42)", abiType, FormatInfo{}};
217-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
217+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
218218
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
219219
FunctionCall call{"f(bool)", {0}, arguments, expectations};
220220
call.omitsArrow = false;
@@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE(format_empty_byte_range)
228228
bytes expectedBytes;
229229
ABIType abiType{ABIType::None, ABIType::AlignNone, 0};
230230
Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
231-
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}};
231+
FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
232232
FunctionCallArgs arguments{vector<Parameter>{}, string{}};
233233
FunctionCall call{"f()", {0}, arguments, expectations};
234234
call.omitsArrow = false;
@@ -242,7 +242,7 @@ BOOST_AUTO_TEST_CASE(format_failure_singleline)
242242
bytes expectedBytes = toBigEndian(u256{1});
243243
ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
244244
Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
245-
FunctionCallExpectations expectations{vector<Parameter>{}, true, string{}};
245+
FunctionCallExpectations expectations{vector<Parameter>{}, true, string{}, {}};
246246
FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
247247
FunctionCall call{"f(uint8)", {0}, arguments, expectations};
248248
call.omitsArrow = false;

0 commit comments

Comments
 (0)