Skip to content

Commit c6d900c

Browse files
SirTysonSirTyson
committed
Fixed tests
1 parent 796392c commit c6d900c

6 files changed

+613
-424
lines changed

‎src/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ TEST_FILES = $(TESTDATA_DIR)/stellar-core_example.cfg $(TESTDATA_DIR)/stellar-co
8181
$(TESTDATA_DIR)/stellar-core_testnet.cfg $(TESTDATA_DIR)/stellar-core_testnet_legacy.cfg \
8282
$(TESTDATA_DIR)/stellar-history.testnet.6714239.json $(TESTDATA_DIR)/stellar-history.livenet.15686975.json \
8383
$(TESTDATA_DIR)/stellar-core_testnet_validator.cfg $(TESTDATA_DIR)/stellar-core_example_validators.cfg \
84-
$(TESTDATA_DIR)/stellar-history.testnet.6714239.networkPassphrase.json
84+
$(TESTDATA_DIR)/stellar-history.testnet.6714239.networkPassphrase.json \
85+
$(TESTDATA_DIR)/stellar-history.testnet.6714239.networkPassphrase.v2.json
8586

8687
BUILT_SOURCES = $(SRC_X_FILES:.x=.h) main/StellarCoreVersion.cpp main/XDRFilesSha256.cpp $(TEST_FILES)
8788

‎src/history/serialize-tests/stellar-history.testnet.6714239.networkPassphrase.v2.json

+184
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
{
2+
"version": 2,
3+
"server": "v9.0.1-dirty",
4+
"currentLedger": 6714239,
5+
"networkPassphrase": "(V) (;,,;) (V)",
6+
"currentBuckets": [
7+
{
8+
"curr": "0000000000000000000000000000000000000000000000000000000000000000",
9+
"next": {
10+
"state": 0
11+
},
12+
"snap": "0000000000000000000000000000000000000000000000000000000000000000"
13+
},
14+
{
15+
"curr": "c3131b946b5cadf713ca88d299505fe16572ffeefa083b2858a674452fd8ba76",
16+
"next": {
17+
"state": 1,
18+
"output": "0000000000000000000000000000000000000000000000000000000000000000"
19+
},
20+
"snap": "e08d65b07ca3cb0999a340247afcf0fedbe1d1e1df6ada0c34422e2d3b905735"
21+
},
22+
{
23+
"curr": "b767206bf07e3dbbe14cff681234b7ccfd4dab5957ce6d440f692409498ff909",
24+
"next": {
25+
"state": 1,
26+
"output": "e08d65b07ca3cb0999a340247afcf0fedbe1d1e1df6ada0c34422e2d3b905735"
27+
},
28+
"snap": "0bdeee425d0b4c3458353b7b20901e60eb8b5289dd8a714e59f910a47b49d66e"
29+
},
30+
{
31+
"curr": "7a1132e7566dea51a35f6981181ad3f108256bb5f9470f0e9df3222c138c6446",
32+
"next": {
33+
"state": 1,
34+
"output": "0bdeee425d0b4c3458353b7b20901e60eb8b5289dd8a714e59f910a47b49d66e"
35+
},
36+
"snap": "1863067ae6d91218c589b2ccc40a983edc144196ca3a2cd43c7426275a8a3f40"
37+
},
38+
{
39+
"curr": "f4e99dd7c25206f6766911dc812502f0ec2cd5469f4742b7848523aa6e0da03e",
40+
"next": {
41+
"state": 1,
42+
"output": "dd9bcfba61bf17be7093f56eb6e1392d5f25981282d4331cb51961852c11ee16"
43+
},
44+
"snap": "04a5699bb688ef82e8a352b2ccfa134458c794a0365dddfac00f2e6fc7c159f9"
45+
},
46+
{
47+
"curr": "f9de28d23c53d1affe871a97a5c9747bbc9a208754388dc88cdea96852977471",
48+
"next": {
49+
"state": 1,
50+
"output": "b6d012ce7af5624c24d4ff386ae172516ff0cd13f70cd030edbb503b87ad196b"
51+
},
52+
"snap": "1fd4b80ec5278fc08269f96728206fcfbf5d3f5efe1bf7f93d4a3d79a75eeca8"
53+
},
54+
{
55+
"curr": "71f4453669ec84632afcdd1f2a97685121cef52a01db58c8d4c810310c07c0d8",
56+
"next": {
57+
"state": 1,
58+
"output": "c0992883bd5f4631f736c5287538342c08e00f80be16b36a5a794772114a3db9"
59+
},
60+
"snap": "b8913fa01d3b58b763fc04ee1528317c0ec71f250500758e09d0a839ca405be4"
61+
},
62+
{
63+
"curr": "a113930757a7ff48a8898dad74c1446a942b5e5b5f443626a8f943768432ec41",
64+
"next": {
65+
"state": 1,
66+
"output": "9b6feec6e7e366b898a59ad562b31ce3305d7e1545f92bf5fda5c13e032bc0f9"
67+
},
68+
"snap": "d3b1a36290f39d4cd09e7ef80b7cb871df9a3a5b1e40d8e5cfd26c754914ca84"
69+
},
70+
{
71+
"curr": "e57d1c6342f6e47c2ac0305cd5251bb0fb2cdd40923af87c4657e896e33acdc5",
72+
"next": {
73+
"state": 1,
74+
"output": "de8805e4232fe81c04f5536487e586ab6d3ef38eff93bad5bf6872a3e53ced6b"
75+
},
76+
"snap": "fcddef737957961d828023a081b84449dc0ab20524e5155837bae12a3b18ac64"
77+
},
78+
{
79+
"curr": "5c3387bcaad3139bb48ff2a99010d6f075cc9b20ba2f22c194fcda2a97926f55",
80+
"next": {
81+
"state": 1,
82+
"output": "3373185b0eb537b909c56e6e16e76e33d966dc7ee1e7168123cfe1114d444e88"
83+
},
84+
"snap": "2958d66f083ca13ca97a184a5be3a03b3c2e494f832b1ac1a3e16d7b02e9f50c"
85+
},
86+
{
87+
"curr": "ae7e4814b50e176d8e3532e462e2e9db02f218adebd74603d7e349cc19f489e1",
88+
"next": {
89+
"state": 1,
90+
"output": "50abed8a9d86c072cfe8388246b7a378dc355fe996fd7384a5ee57e8da2ad51d"
91+
},
92+
"snap": "0000000000000000000000000000000000000000000000000000000000000000"
93+
}
94+
],
95+
"hotArchiveBuckets": [
96+
{
97+
"curr": "0000000000000000000000000000000000000000000000000000000000000000",
98+
"next": {
99+
"state": 0
100+
},
101+
"snap": "0000000000000000000000000000000000000000000000000000000000000000"
102+
},
103+
{
104+
"curr": "c3131b946b5cadf713ca88d299505fe16572ffeefa083b2858a674452fd8ba74",
105+
"next": {
106+
"state": 1,
107+
"output": "0000000000000000000000000000000000000000000000000000000000000000"
108+
},
109+
"snap": "e08d65b07ca3cb0999a340247afcf0fedbe1d1e1df6ada0c34422e2d3b905732"
110+
},
111+
{
112+
"curr": "b767206bf07e3dbbe14cff681234b7ccfd4dab5957ce6d440f692409498ff901",
113+
"next": {
114+
"state": 1,
115+
"output": "e08d65b07ca3cb0999a340247afcf0fedbe1d1e1df6ada0c34422e2d3b905732"
116+
},
117+
"snap": "0bdeee425d0b4c3458353b7b20901e60eb8b5289dd8a714e59f910a47b49d661"
118+
},
119+
{
120+
"curr": "7a1132e7566dea51a35f6981181ad3f108256bb5f9470f0e9df3222c138c6442",
121+
"next": {
122+
"state": 1,
123+
"output": "0bdeee425d0b4c3458353b7b20901e60eb8b5289dd8a714e59f910a47b49d661"
124+
},
125+
"snap": "1863067ae6d91218c589b2ccc40a983edc144196ca3a2cd43c7426275a8a3f42"
126+
},
127+
{
128+
"curr": "f4e99dd7c25206f6766911dc812502f0ec2cd5469f4742b7848523aa6e0da031",
129+
"next": {
130+
"state": 1,
131+
"output": "dd9bcfba61bf17be7093f56eb6e1392d5f25981282d4331cb51961852c11ee12"
132+
},
133+
"snap": "04a5699bb688ef82e8a352b2ccfa134458c794a0365dddfac00f2e6fc7c159f1"
134+
},
135+
{
136+
"curr": "f9de28d23c53d1affe871a97a5c9747bbc9a208754388dc88cdea96852977472",
137+
"next": {
138+
"state": 1,
139+
"output": "b6d012ce7af5624c24d4ff386ae172516ff0cd13f70cd030edbb503b87ad1961"
140+
},
141+
"snap": "1fd4b80ec5278fc08269f96728206fcfbf5d3f5efe1bf7f93d4a3d79a75eeca2"
142+
},
143+
{
144+
"curr": "71f4453669ec84632afcdd1f2a97685121cef52a01db58c8d4c810310c07c0d1",
145+
"next": {
146+
"state": 1,
147+
"output": "c0992883bd5f4631f736c5287538342c08e00f80be16b36a5a794772114a3db2"
148+
},
149+
"snap": "b8913fa01d3b58b763fc04ee1528317c0ec71f250500758e09d0a839ca405be1"
150+
},
151+
{
152+
"curr": "a113930757a7ff48a8898dad74c1446a942b5e5b5f443626a8f943768432ec42",
153+
"next": {
154+
"state": 1,
155+
"output": "9b6feec6e7e366b898a59ad562b31ce3305d7e1545f92bf5fda5c13e032bc0f1"
156+
},
157+
"snap": "d3b1a36290f39d4cd09e7ef80b7cb871df9a3a5b1e40d8e5cfd26c754914ca24"
158+
},
159+
{
160+
"curr": "e57d1c6342f6e47c2ac0305cd5251bb0fb2cdd40923af87c4657e896e33acdc1",
161+
"next": {
162+
"state": 1,
163+
"output": "de8805e4232fe81c04f5536487e586ab6d3ef38eff93bad5bf6872a3e53ced62"
164+
},
165+
"snap": "fcddef737957961d828023a081b84449dc0ab20524e5155837bae12a3b18ac61"
166+
},
167+
{
168+
"curr": "5c3387bcaad3139bb48ff2a99010d6f075cc9b20ba2f22c194fcda2a97926f52",
169+
"next": {
170+
"state": 1,
171+
"output": "3373185b0eb537b909c56e6e16e76e33d966dc7ee1e7168123cfe1114d444e81"
172+
},
173+
"snap": "2958d66f083ca13ca97a184a5be3a03b3c2e494f832b1ac1a3e16d7b02e9f502"
174+
},
175+
{
176+
"curr": "ae7e4814b50e176d8e3532e462e2e9db02f218adebd74603d7e349cc19f489e2",
177+
"next": {
178+
"state": 1,
179+
"output": "50abed8a9d86c072cfe8388246b7a378dc355fe996fd7384a5ee57e8da2ad52"
180+
},
181+
"snap": "0000000000000000000000000000000000000000000000000000000000000000"
182+
}
183+
]
184+
}

‎src/history/test/HistoryTests.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,9 @@ TEST_CASE_VERSIONS(
14611461

14621462
BucketTestUtils::for_versions_with_differing_bucket_logic(
14631463
cfg, [&](Config const& cfg) {
1464-
Application::pointer app = createTestApplication(clock, cfg);
1464+
auto app =
1465+
createTestApplication<BucketTestUtils::BucketTestApplication>(
1466+
clock, cfg);
14651467
auto& hm = app->getHistoryManager();
14661468
auto& lm = app->getLedgerManager();
14671469
auto& bl = app->getBucketManager().getLiveBucketList();
@@ -1470,9 +1472,11 @@ TEST_CASE_VERSIONS(
14701472
{
14711473
auto lcl = lm.getLastClosedLedgerHeader();
14721474
lcl.header.ledgerSeq += 1;
1473-
BucketTestUtils::addLiveBatchAndUpdateSnapshot(
1474-
*app, lcl.header, {},
1475-
LedgerTestUtils::generateValidUniqueLedgerEntries(8), {});
1475+
lm.setNextLedgerEntryBatchForBucketTesting(
1476+
{},
1477+
LedgerTestUtils::generateValidLedgerEntriesWithExclusions(
1478+
{LedgerEntryType::CONFIG_SETTING}, 8),
1479+
{});
14761480
clock.crank(true);
14771481
}
14781482

‎src/history/test/HistoryTestsUtils.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -536,11 +536,11 @@ CatchupSimulation::generateRandomLedger(uint32_t version)
536536
uint32_t inclusion = 100;
537537

538538
sorobanTxs.push_back(createUploadWasmTx(
539-
getApp(), stroopy, inclusion, DEFAULT_TEST_RESOURCE_FEE, res,
540-
{}, 0, rand_uniform(101, 1'000)));
539+
getApp(), stroopy, inclusion, DEFAULT_TEST_RESOURCE_FEE * 5,
540+
res, {}, 0, rand_uniform(101, 2'000)));
541541
sorobanTxs.push_back(createUploadWasmTx(
542-
getApp(), eve, inclusion * 5, DEFAULT_TEST_RESOURCE_FEE, res,
543-
{}, 0, rand_uniform(101, 1'000)));
542+
getApp(), eve, inclusion * 5, DEFAULT_TEST_RESOURCE_FEE * 5,
543+
res, {}, 0, rand_uniform(101, 2'000)));
544544
check = true;
545545
}
546546
}

‎src/testdata/ledger-close-meta-v1-protocol-23-soroban.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@
66
"v": 0
77
},
88
"ledgerHeader": {
9-
"hash": "a6fbcc8f60da431ed4fb4ced5b84b54489b0e331b8a9a2b1e85c9c22a19551fa",
9+
"hash": "ecdec1018a374931b9093f17859605bd5bc224b5871ac4c73fa700b3cd56d974",
1010
"header": {
1111
"ledgerVersion": 23,
12-
"previousLedgerHash": "6994ce5b967538e38ef4e55d3d98fda420a10a323736a85ec02decae70faac8e",
12+
"previousLedgerHash": "29e09c18ed9748b5acaabe34318b1725e4c48522fdec2bd8ad86b6e2cb4f7430",
1313
"scpValue": {
14-
"txSetHash": "79dc76ffd553e86f2cb9b63042a8f89a706f3cc55fec8cac7865c2363725abb7",
14+
"txSetHash": "2ca34974f03b8f3a517ab05cb13c0a1653a249bf05f0ad2371881b31c14fbc2c",
1515
"closeTime": 1451692800,
1616
"upgrades": [],
1717
"ext": {
1818
"v": "STELLAR_VALUE_SIGNED",
1919
"lcValueSignature": {
2020
"nodeID": "GDDOUW25MRFLNXQMN3OODP6JQEXSGLMHAFZV4XPQ2D3GA4QFIDMEJG2O",
21-
"signature": "13eb24d05caeb4e721fbbe96bd6170d90da02f42567e519528177c4efae238365a87425cef90db445ba2bc28585022435fa17545f9bed1051510a940ab23c600"
21+
"signature": "412ad459feccc9446a2a9f89f6a2b86ef31814deab3284f94bb46dc3f889062d9603bcaf8964be714dbcd1aa6cf5de33f816515c3fd8bc7c035eec23161d0906"
2222
}
2323
}
2424
},
2525
"txSetResultHash": "65b6fe91abfe43ed98fa2163f08fdf3f2f3231101bba05102521186c25a1cc4b",
26-
"bucketListHash": "d71ea87f579389c8c976fca3cf1b755de14330d7aaa35e6544411ec2bd1cf443",
26+
"bucketListHash": "e0d3d2574896aa7e5349ea7ac29ebc63b460365278af3c5ab78a72b1b362be19",
2727
"ledgerSeq": 28,
2828
"totalCoins": 1000000000000000000,
2929
"feePool": 804520,
@@ -49,7 +49,7 @@
4949
"txSet": {
5050
"v": 1,
5151
"v1TxSet": {
52-
"previousLedgerHash": "6994ce5b967538e38ef4e55d3d98fda420a10a323736a85ec02decae70faac8e",
52+
"previousLedgerHash": "29e09c18ed9748b5acaabe34318b1725e4c48522fdec2bd8ad86b6e2cb4f7430",
5353
"phases": [
5454
{
5555
"v": 0,

0 commit comments

Comments
 (0)