Skip to content

Commit 5356044

Browse files
jvc-bytejvc-byte
committed
resolve conflict
1 parent 58f21f3 commit 5356044

37 files changed

+68404
-99415
lines changed

‎.deps/remix-tests/artifacts/Assert.json

+17,503
Large diffs are not rendered by default.

‎.deps/remix-tests/artifacts/Assert_metadata.json

+367
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,367 @@
1+
{
2+
"compiler": {
3+
"version": "0.8.26+commit.8a97fa7a"
4+
},
5+
"language": "Solidity",
6+
"output": {
7+
"abi": [
8+
{
9+
"anonymous": false,
10+
"inputs": [
11+
{
12+
"indexed": false,
13+
"internalType": "bool",
14+
"name": "passed",
15+
"type": "bool"
16+
},
17+
{
18+
"indexed": false,
19+
"internalType": "string",
20+
"name": "message",
21+
"type": "string"
22+
},
23+
{
24+
"indexed": false,
25+
"internalType": "string",
26+
"name": "methodName",
27+
"type": "string"
28+
}
29+
],
30+
"name": "AssertionEvent",
31+
"type": "event"
32+
},
33+
{
34+
"anonymous": false,
35+
"inputs": [
36+
{
37+
"indexed": false,
38+
"internalType": "bool",
39+
"name": "passed",
40+
"type": "bool"
41+
},
42+
{
43+
"indexed": false,
44+
"internalType": "string",
45+
"name": "message",
46+
"type": "string"
47+
},
48+
{
49+
"indexed": false,
50+
"internalType": "string",
51+
"name": "methodName",
52+
"type": "string"
53+
},
54+
{
55+
"indexed": false,
56+
"internalType": "address",
57+
"name": "returned",
58+
"type": "address"
59+
},
60+
{
61+
"indexed": false,
62+
"internalType": "address",
63+
"name": "expected",
64+
"type": "address"
65+
}
66+
],
67+
"name": "AssertionEventAddress",
68+
"type": "event"
69+
},
70+
{
71+
"anonymous": false,
72+
"inputs": [
73+
{
74+
"indexed": false,
75+
"internalType": "bool",
76+
"name": "passed",
77+
"type": "bool"
78+
},
79+
{
80+
"indexed": false,
81+
"internalType": "string",
82+
"name": "message",
83+
"type": "string"
84+
},
85+
{
86+
"indexed": false,
87+
"internalType": "string",
88+
"name": "methodName",
89+
"type": "string"
90+
},
91+
{
92+
"indexed": false,
93+
"internalType": "bool",
94+
"name": "returned",
95+
"type": "bool"
96+
},
97+
{
98+
"indexed": false,
99+
"internalType": "bool",
100+
"name": "expected",
101+
"type": "bool"
102+
}
103+
],
104+
"name": "AssertionEventBool",
105+
"type": "event"
106+
},
107+
{
108+
"anonymous": false,
109+
"inputs": [
110+
{
111+
"indexed": false,
112+
"internalType": "bool",
113+
"name": "passed",
114+
"type": "bool"
115+
},
116+
{
117+
"indexed": false,
118+
"internalType": "string",
119+
"name": "message",
120+
"type": "string"
121+
},
122+
{
123+
"indexed": false,
124+
"internalType": "string",
125+
"name": "methodName",
126+
"type": "string"
127+
},
128+
{
129+
"indexed": false,
130+
"internalType": "bytes32",
131+
"name": "returned",
132+
"type": "bytes32"
133+
},
134+
{
135+
"indexed": false,
136+
"internalType": "bytes32",
137+
"name": "expected",
138+
"type": "bytes32"
139+
}
140+
],
141+
"name": "AssertionEventBytes32",
142+
"type": "event"
143+
},
144+
{
145+
"anonymous": false,
146+
"inputs": [
147+
{
148+
"indexed": false,
149+
"internalType": "bool",
150+
"name": "passed",
151+
"type": "bool"
152+
},
153+
{
154+
"indexed": false,
155+
"internalType": "string",
156+
"name": "message",
157+
"type": "string"
158+
},
159+
{
160+
"indexed": false,
161+
"internalType": "string",
162+
"name": "methodName",
163+
"type": "string"
164+
},
165+
{
166+
"indexed": false,
167+
"internalType": "int256",
168+
"name": "returned",
169+
"type": "int256"
170+
},
171+
{
172+
"indexed": false,
173+
"internalType": "int256",
174+
"name": "expected",
175+
"type": "int256"
176+
}
177+
],
178+
"name": "AssertionEventInt",
179+
"type": "event"
180+
},
181+
{
182+
"anonymous": false,
183+
"inputs": [
184+
{
185+
"indexed": false,
186+
"internalType": "bool",
187+
"name": "passed",
188+
"type": "bool"
189+
},
190+
{
191+
"indexed": false,
192+
"internalType": "string",
193+
"name": "message",
194+
"type": "string"
195+
},
196+
{
197+
"indexed": false,
198+
"internalType": "string",
199+
"name": "methodName",
200+
"type": "string"
201+
},
202+
{
203+
"indexed": false,
204+
"internalType": "int256",
205+
"name": "returned",
206+
"type": "int256"
207+
},
208+
{
209+
"indexed": false,
210+
"internalType": "uint256",
211+
"name": "expected",
212+
"type": "uint256"
213+
}
214+
],
215+
"name": "AssertionEventIntUint",
216+
"type": "event"
217+
},
218+
{
219+
"anonymous": false,
220+
"inputs": [
221+
{
222+
"indexed": false,
223+
"internalType": "bool",
224+
"name": "passed",
225+
"type": "bool"
226+
},
227+
{
228+
"indexed": false,
229+
"internalType": "string",
230+
"name": "message",
231+
"type": "string"
232+
},
233+
{
234+
"indexed": false,
235+
"internalType": "string",
236+
"name": "methodName",
237+
"type": "string"
238+
},
239+
{
240+
"indexed": false,
241+
"internalType": "string",
242+
"name": "returned",
243+
"type": "string"
244+
},
245+
{
246+
"indexed": false,
247+
"internalType": "string",
248+
"name": "expected",
249+
"type": "string"
250+
}
251+
],
252+
"name": "AssertionEventString",
253+
"type": "event"
254+
},
255+
{
256+
"anonymous": false,
257+
"inputs": [
258+
{
259+
"indexed": false,
260+
"internalType": "bool",
261+
"name": "passed",
262+
"type": "bool"
263+
},
264+
{
265+
"indexed": false,
266+
"internalType": "string",
267+
"name": "message",
268+
"type": "string"
269+
},
270+
{
271+
"indexed": false,
272+
"internalType": "string",
273+
"name": "methodName",
274+
"type": "string"
275+
},
276+
{
277+
"indexed": false,
278+
"internalType": "uint256",
279+
"name": "returned",
280+
"type": "uint256"
281+
},
282+
{
283+
"indexed": false,
284+
"internalType": "uint256",
285+
"name": "expected",
286+
"type": "uint256"
287+
}
288+
],
289+
"name": "AssertionEventUint",
290+
"type": "event"
291+
},
292+
{
293+
"anonymous": false,
294+
"inputs": [
295+
{
296+
"indexed": false,
297+
"internalType": "bool",
298+
"name": "passed",
299+
"type": "bool"
300+
},
301+
{
302+
"indexed": false,
303+
"internalType": "string",
304+
"name": "message",
305+
"type": "string"
306+
},
307+
{
308+
"indexed": false,
309+
"internalType": "string",
310+
"name": "methodName",
311+
"type": "string"
312+
},
313+
{
314+
"indexed": false,
315+
"internalType": "uint256",
316+
"name": "returned",
317+
"type": "uint256"
318+
},
319+
{
320+
"indexed": false,
321+
"internalType": "int256",
322+
"name": "expected",
323+
"type": "int256"
324+
}
325+
],
326+
"name": "AssertionEventUintInt",
327+
"type": "event"
328+
}
329+
],
330+
"devdoc": {
331+
"kind": "dev",
332+
"methods": {},
333+
"version": 1
334+
},
335+
"userdoc": {
336+
"kind": "user",
337+
"methods": {},
338+
"version": 1
339+
}
340+
},
341+
"settings": {
342+
"compilationTarget": {
343+
".deps/remix-tests/remix_tests.sol": "Assert"
344+
},
345+
"evmVersion": "cancun",
346+
"libraries": {},
347+
"metadata": {
348+
"bytecodeHash": "ipfs"
349+
},
350+
"optimizer": {
351+
"enabled": true,
352+
"runs": 200
353+
},
354+
"remappings": []
355+
},
356+
"sources": {
357+
".deps/remix-tests/remix_tests.sol": {
358+
"keccak256": "0xe2783cdc204cba8c72494119339f1d90f9022b15d6c718c668b7f097d8e29787",
359+
"license": "GPL-3.0",
360+
"urls": [
361+
"bzz-raw://bb6a22e64c7f16bcaab63b1c1a1b269d5be8a6d37bdd9dec1718477ab916b18e",
362+
"dweb:/ipfs/QmdkW1tT5iadBvaHMCoskhDGZKnfdg8o1D9CcoQYtdJet7"
363+
]
364+
}
365+
},
366+
"version": 1
367+
}

0 commit comments

Comments
 (0)