Skip to content

Commit 2d72050

Browse files
CJentzschCJentzsch
committed
Applied recent protocol changes (PoC7) to existin tests
1 parent 1a67a96 commit 2d72050

File tree

3 files changed

+39
-89
lines changed

3 files changed

+39
-89
lines changed

‎vmtests/vmIOandFlowOperationsTest.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,14 @@
148148
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
149149
"value" : "1000000000000000000"
150150
},
151-
"gas" : "9796",
151+
"gas" : "9997",
152152
"out" : "0x",
153153
"post" : {
154154
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
155155
"balance" : "1000000000000000000",
156156
"code" : "0x60236007586001600257",
157157
"nonce" : "0",
158158
"storage" : {
159-
"0x02" : "0x23"
160159
}
161160
}
162161
},
@@ -191,7 +190,7 @@
191190
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
192191
"value" : "1000000000000000000"
193192
},
194-
"gas" : "0",
193+
"gas" : "9997",
195194
"out" : "0x",
196195
"post" : {
197196
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -233,15 +232,14 @@
233232
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
234233
"value" : "1000000000000000000"
235234
},
236-
"gas" : "9795",
235+
"gas" : "9996",
237236
"out" : "0x",
238237
"post" : {
239238
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
240239
"balance" : "1000000000000000000",
241240
"code" : "0x602360016009596001600257",
242241
"nonce" : "0",
243242
"storage" : {
244-
"0x02" : "0x23"
245243
}
246244
}
247245
},
@@ -276,15 +274,14 @@
276274
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
277275
"value" : "1000000000000000000"
278276
},
279-
"gas" : "9794",
277+
"gas" : "9996",
280278
"out" : "0x",
281279
"post" : {
282280
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
283281
"balance" : "1000000000000000000",
284282
"code" : "0x602360006009596001600257",
285283
"nonce" : "0",
286284
"storage" : {
287-
"0x02" : "0x01"
288285
}
289286
}
290287
},

‎vmtests/vmSystemOperationsTest.json

Lines changed: 29 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
267267
"value" : "100000"
268268
},
269-
"gas" : "9999999999535",
269+
"gas" : "9999999999739",
270270
"out" : "0x",
271271
"post" : {
272272
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -282,7 +282,6 @@
282282
"code" : "0x600035560f6009590060203560003557",
283283
"nonce" : "0",
284284
"storage" : {
285-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
286285
}
287286
}
288287
},
@@ -330,7 +329,7 @@
330329
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
331330
"value" : "100000"
332331
},
333-
"gas" : "535",
332+
"gas" : "739",
334333
"out" : "0x",
335334
"post" : {
336335
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -346,7 +345,6 @@
346345
"code" : "0x600035560f6009590060203560003557",
347346
"nonce" : "0",
348347
"storage" : {
349-
"0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
350348
}
351349
}
352350
},
@@ -394,7 +392,7 @@
394392
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
395393
"value" : "100000"
396394
},
397-
"gas" : "635",
395+
"gas" : "739",
398396
"out" : "0x",
399397
"post" : {
400398
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
@@ -457,14 +455,15 @@
457455
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
458456
"value" : "100000"
459457
},
460-
"gas" : "764",
458+
"gas" : "739",
461459
"out" : "0x",
462460
"post" : {
463461
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
464462
"balance" : "999999999999999977",
465463
"code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56064f1600057",
466464
"nonce" : "0",
467465
"storage" : {
466+
"0x" : "0x01"
468467
}
469468
},
470469
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -726,12 +725,6 @@
726725
},
727726
"PostToNameRegistrator0" : {
728727
"callcreates" : [
729-
{
730-
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
731-
"destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
732-
"gasLimit" : "1000000",
733-
"value" : "23"
734-
}
735728
],
736729
"env" : {
737730
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -744,36 +737,35 @@
744737
"exec" : {
745738
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
746739
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
747-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
740+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
748741
"data" : "0x",
749742
"gas" : "10000000000000",
750743
"gasPrice" : "100000000000000",
751744
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
752745
"value" : "100000"
753746
},
754-
"gas" : "9999998999967",
747+
"gas" : "9999999999991",
755748
"out" : "0x",
756749
"post" : {
757750
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
758-
"balance" : "999999999999999977",
759-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
751+
"balance" : "1000000000000000000",
752+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
760753
"nonce" : "0",
761754
"storage" : {
762755
}
763756
},
764757
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
765-
"balance" : "46",
758+
"balance" : "23",
766759
"code" : "0x600035560f6009590060203560003557",
767760
"nonce" : "0",
768761
"storage" : {
769-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
770762
}
771763
}
772764
},
773765
"pre" : {
774766
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
775767
"balance" : "1000000000000000000",
776-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
768+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
777769
"nonce" : "0",
778770
"storage" : {
779771
}
@@ -789,12 +781,6 @@
789781
},
790782
"PostToReturn1" : {
791783
"callcreates" : [
792-
{
793-
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
794-
"destination" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
795-
"gasLimit" : "1000000",
796-
"value" : "23"
797-
}
798784
],
799785
"env" : {
800786
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -807,25 +793,25 @@
807793
"exec" : {
808794
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
809795
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
810-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
796+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
811797
"data" : "0x",
812798
"gas" : "10000000000000",
813799
"gasPrice" : "100000000000000",
814800
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
815801
"value" : "100000"
816802
},
817-
"gas" : "9999998999967",
803+
"gas" : "9999999999991",
818804
"out" : "0x",
819805
"post" : {
820806
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
821-
"balance" : "999999999999999977",
822-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
807+
"balance" : "1000000000000000000",
808+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
823809
"nonce" : "0",
824810
"storage" : {
825811
}
826812
},
827813
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
828-
"balance" : "46",
814+
"balance" : "23",
829815
"code" : "0x603760005560026000f2",
830816
"nonce" : "0",
831817
"storage" : {
@@ -835,7 +821,7 @@
835821
"pre" : {
836822
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
837823
"balance" : "1000000000000000000",
838-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa60205460406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f3",
824+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080",
839825
"nonce" : "0",
840826
"storage" : {
841827
}
@@ -870,15 +856,14 @@
870856
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
871857
"value" : "1000000000000000000"
872858
},
873-
"gas" : "9771",
859+
"gas" : "9975",
874860
"out" : "0x",
875861
"post" : {
876862
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
877863
"balance" : "1000000000000000000",
878864
"code" : "0x600035560f6009590060203560003557",
879865
"nonce" : "0",
880866
"storage" : {
881-
"0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
882867
}
883868
}
884869
},
@@ -894,12 +879,6 @@
894879
},
895880
"callstatelessToNameRegistrator0" : {
896881
"callcreates" : [
897-
{
898-
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
899-
"destination" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
900-
"gasLimit" : "1000000",
901-
"value" : "23"
902-
}
903882
],
904883
"env" : {
905884
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -912,23 +891,22 @@
912891
"exec" : {
913892
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
914893
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
915-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f4600057",
894+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
916895
"data" : "0x",
917896
"gas" : "10000000000000",
918897
"gasPrice" : "100000000000000",
919898
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
920899
"value" : "100000"
921900
},
922-
"gas" : "9999999999535",
901+
"gas" : "9999999999790",
923902
"out" : "0x",
924903
"post" : {
925904
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
926905
"balance" : "1000000000000000000",
927-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f4600057",
906+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
928907
"nonce" : "0",
929908
"storage" : {
930-
"0x" : "0x01",
931-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
909+
"0x" : "0x80"
932910
}
933911
},
934912
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -942,7 +920,7 @@
942920
"pre" : {
943921
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
944922
"balance" : "1000000000000000000",
945-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b5620f4240f4600057",
923+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
946924
"nonce" : "0",
947925
"storage" : {
948926
}
@@ -958,12 +936,6 @@
958936
},
959937
"callstatelessToReturn1" : {
960938
"callcreates" : [
961-
{
962-
"data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa",
963-
"destination" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
964-
"gasLimit" : "500",
965-
"value" : "23"
966-
}
967939
],
968940
"env" : {
969941
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -976,23 +948,22 @@
976948
"exec" : {
977949
"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
978950
"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
979-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f4600057",
951+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
980952
"data" : "0x",
981953
"gas" : "10000000000000",
982954
"gasPrice" : "100000000000000",
983955
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
984956
"value" : "100000"
985957
},
986-
"gas" : "9999999999555",
958+
"gas" : "9999999999790",
987959
"out" : "0x",
988960
"post" : {
989961
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
990962
"balance" : "1000000000000000000",
991-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f4600057",
963+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
992964
"nonce" : "0",
993965
"storage" : {
994-
"0x" : "0x01",
995-
"0x01" : "0x01"
966+
"0x" : "0x80"
996967
}
997968
},
998969
"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
@@ -1006,7 +977,7 @@
1006977
"pre" : {
1007978
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
1008979
"balance" : "1000000000000000000",
1009-
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f4600057",
980+
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000547faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020546080600057",
1010981
"nonce" : "0",
1011982
"storage" : {
1012983
}
@@ -1482,4 +1453,4 @@
14821453
}
14831454
}
14841455
}
1485-
}
1456+
}

0 commit comments

Comments
 (0)