Skip to content

Commit 058f545

Browse files
committed
Loop from 256 -> 516 for dag gen, fix unit tests
1 parent 67a80ef commit 058f545

File tree

5 files changed

+131
-130
lines changed

5 files changed

+131
-130
lines changed

lib/ethash/ethash.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ constexpr static int light_cache_growth = 1 << 17;
2424
constexpr static int light_cache_rounds = 3;
2525
constexpr static int full_dataset_init_size = 1 << 30;
2626
constexpr static int full_dataset_growth = 1 << 23;
27-
constexpr static int full_dataset_item_parents = 256;
27+
constexpr static int full_dataset_item_parents = 512;
2828

2929
// Verify constants:
3030
static_assert(sizeof(hash512) == ETHASH_LIGHT_CACHE_ITEM_SIZE, "");

test/unittests/progpow_test_vectors.hpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,44 +21,44 @@ struct progpow_hash_test_case
2121

2222
progpow_hash_test_case progpow_hash_test_cases[] = {
2323
{0, "0000000000000000000000000000000000000000000000000000000000000000", "0000000000000000",
24-
"40ce8bf6046c09f90f812f015d4ab8a1b504e7313e86d8a96197d5dadc3634e5",
25-
"e6480cfa901dd209a9d8bef73275896be179f86b42e136efe692e14a41cb17b2"},
24+
"6e97b47b134fda0c7888802988e1a373affeb28bcd813b6e9a0fc669c935d03a",
25+
"e601a7257a70dc48fccc97a7330d704d776047623b92883d77111fb36870f3d1"},
2626
{49, "63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b", "0000000007073c07",
27-
"62f6b49f39092b76fc04bb8db1e435fa5c3182a15f3c179ae7353a073c752c11",
28-
"c3a419fc1e295899c0e0e596b1e9c7b609df96802b4b46157d07a632b8043979"},
27+
"d36f7e815ee09e74eceb9c96993a3d681edf2bf0921fc7bb710364042db99777",
28+
"e7ced124598fd2500a55ad9f9f48e3569327fe50493c77a4ac9799b96efb9463"},
2929
{50, "9e7248f20914913a73d80a70174c331b1d34f260535ac3631d770e656b5dd922", "00000000076e482e",
30-
"d6c6ec98a9dc1ed90eb70c476a32a1bc4d97329f9e867a4157378ce0a9b7f25e",
31-
"0ed2d84bd91987d85971d38dd649d7b605dfc524b4e05f8aee6eb34142169117"},
30+
"d6dc634ae837e2785b347648ea515e25e5d8821ae0b95e1c2a9c2d497e0dcfbd",
31+
"ab0ad7ef8d8ee317dd12d10310aceed7321d34fb263791c2de5776a6658d177e"},
3232
{99, "de37e1824c86d35d154cf65a88de6d9286aec4f7f10c3fc9f0fa1bcc2687188d", "000000003917afab",
33-
"7b8d1d879bc69fb1d5cf9a39822f2ee7d2d6e24bf785dbe605b275005f513c29",
34-
"fbada78801c65f08951dc8b4e9b00c2308d996053d1ea2c7caa181ee808cb3f2"},
33+
"fa706860e5e0e830d5d1d7157e5bea7f5f8a350c7c8612ac1d1fcf2974d64244",
34+
"aa85340690f2e907054324a5021937910e15edfd1ef1577231843e7d32ec3a61"},
3535
{29950, "ac7b55e801511b77e11d52e9599206101550144525b5679f2dab19386f23dcce", "005d409dbc23a62a",
36-
"f8f15ab6c8d5f1d57875bcbf1700688c372874478a9e272a3f45d072c4f6e74a",
37-
"53539c8764df6552898fed503bf8a688c8f8fc967ea24e04907988a2fef287ad"},
36+
"5359807b77a74878269c3a3044df8618a576ce8dc52e1c48d927d4a60e7c6b79",
37+
"022019e5408683f7f8326b4e46b42864a3a069f17b6151e434fcaedecaadd918"},
3838
{29999, "e43d7e0bdc8a4a3f6e291a5ed790b9fa1a0948a2b9e33c844888690847de19f5", "005db5fa4c2a3d03",
39-
"398e0c0be1a3fc28306699222d5ceb9268698461f41fcdf8cc17acb0f1a54ca7",
40-
"adad72cff5199da834759ab50a7711c3848f6cc41887d629eef0818f60b97c26"},
39+
"d15de3f9bfedd9b6d0f498273eb3b437115bdc8326c96c6457ac06deb5c9f389",
40+
"4e93630b81198752f876b24380999189b7b9366c08222ac05e4237b87114f305"},
4141
{30000, "d34519f72c97cae8892c277776259db3320820cb5279a299d0ef1e155e5c6454", "005db8607994ff30",
42-
"140759c86094fe8ce696d6d9c74f6ad92ddf91579e6f86d792bbd0656dcfc485",
43-
"826139aa4d7bf853a3ac392d8e0e2f474c1faa0ec7c5ea81eb3461171f9e1f63"},
42+
"de0348b69bf91dfe2c3d3dba6f0132e9048a5284e57b8d9d20adc5f3dc0d3236",
43+
"c7953d848cda6e304f77b4c6d735645c8e8508a5e74c9e9814ef37b19087cd6c"},
4444
{30049, "8b6ce5da0b06d18db7bd8492d9e5717f8b53e7e098d9fef7886d58a6e913ef64", "005e2e215a8ca2e7",
45-
"0952d0329cacc09ac08d3a10e47af7927113f360a48407d7f37c3a9c5a6097b7",
46-
"0bcde14fd3e7e4bd8cc4b52a1105db135ca1de6c02f1923560ae40105b9c4fbd"},
45+
"975c6a9decc89cba7ace69338d4de8510d9619aef42b1d35d0bef7e0ce0614a9",
46+
"c262d8055e288d04b951a844bfca8ba529f5b4d652b408e3942727d7dd90957a"},
4747
{30050, "c2c46173481b9ced61123d2e293b42ede5a1b323210eb2a684df0874ffe09047", "005e30899481055e",
48-
"db83342bddb5a4a80947ebaa70132232c6ddb6544d64f041150a9363885d18ce",
49-
"6baa8eff51feb3bb5561d005afee62db6b729fe28f28eb26f59befcbf12a9e09"},
48+
"362f2fabdb9699d3634b6499703f939f378ee4eac803396c2b0ed0fe1d154972",
49+
"4cd7e6e79e0b63d42b2b06716a919ccc7834077ec727a9ea94edcdaff2fefab8"},
5050
{30099, "ea42197eb2ba79c63cb5e655b8b1f612c5f08aae1a49ff236795a3516d87bc71", "005ea6aef136f88b",
51-
"bc5eeb1a460dcbaccb52d483ec77483088f35e80ba0724aa8084af49f231f7d4",
52-
"3539e51ab65eec649f9275905a91e9a20b2d481e6e116a5d3fd6b15cc743a37e"},
51+
"b1196457261bd05ccb387a8ff3fd02687bf496bd7943d89419465289669e27aa",
52+
"39d1ebfa783b61a6fa8e9747d0f9f134efae5cfba284a2c80e8deabae6b98676"},
5353
{59950, "49e15ba4bf501ce8fe8876101c808e24c69a859be15de554bf85dbc095491bd6", "02ebe0503bd7b1da",
54-
"60721a35d08a7fd4b1acfe369b5132e6adf187e8150591e502620df0783aa297",
55-
"b9179bd7c4f9429d6f553b249a9ddc0160847f41990f596ebf3fbb9576ddf417"},
54+
"df3dbb1669fd35dbb0ae96bbea2d498f0c6992cbddd092aeace42dd933505f95",
55+
"b8984cf4021c4433f753654848d721f33a0792b4417241f0cf7c7c2db011a54a"},
5656
{59999, "f5c50ba5c0d6210ddb16250ec3efda178de857b2b1703d8d5403bd0f848e19cf", "02edb6275bd221e3",
57-
"32a82af5594b09e9fee26d283aa52e7b57317670a6957f490023e29f456677b5",
58-
"0f058ff227a7c9c3dcb43bdef0db9e2721804a436412104ebe7374734c07887b"},
57+
"5017df70e97ca35638cf439cdbe54f30383d335e18eb4a74d6e166736f1038fa",
58+
"4cf1fa62f25b577ac822a6a28d55f8b7e3ae7fe983abd868ae00927e68c41016"},
5959
{170915, "5b3e8dfa1aafd3924a51f33e2d672d8dae32fa528d8b1d378d6e4db0ec5d665d", "0000000044975727",
60-
"75de15add34e91e4924b08f95a31da83e0ac9ce9e53ba2210a61f70dc5263c88",
61-
"09bc06b70c99ae70f32c46610ba559fd43e16aa1e482f4d56bff5690e084ed97"},
60+
"efb29147484c434f1cc59629da90fd0343e3b047407ecd36e9ad973bd51bbac5",
61+
"e7e6bb3b2f9acd3864bc86f72f87237eaf475633ef650c726ac80eb0adf116b6"},
6262

6363
};
6464
} // namespace

test/unittests/test_cases.hpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,50 +24,50 @@ hash_test_case hash_test_cases[] = {
2424
0,
2525
"2a8de2adf89af77358250bf908bf04ba94a6e8c3ba87775564a41d269a05e4ce",
2626
"4242424242424242",
27-
"58f759ede17a706c93f13030328bcea40c1d1341fb26f2facd21ceb0dae57017",
28-
"dd47fd2d98db51078356852d7c4014e6a5d6c387c35f40e2875b74a256ed7906",
27+
"89b6b75f64a89b05393536d14ccea1f8b40d8dffab98d5a812e2f9210d5118d3",
28+
"89b612bfaf68f940af983f44fc22df6dfc2836a8f6d5f9da4ebe483d868761c5",
2929
},
3030
{
3131
2,
3232
"100cbec5e5ef82991290d0d93d758f19082e71f234cf479192a8b94df6da6bfe",
3333
"307692cf71b12f6d",
34-
"e55d02c555a7969361cf74a9ec6211d8c14e4517930a00442f171bdb1698d175",
35-
"ab9b13423cface72cbec8424221651bc2e384ef0f7a560e038fc68c8d8684829",
34+
"8cdb6f34b433e7871a672c925a7516c469596739b720112b8513e34843cd811f",
35+
"c6ad74a4ea186a1563bc42606601ab8100712c828394b9eb7f5d37bb5905ca0a",
3636
},
3737
{
3838
2683077,
3939
"0313d03c5ed78694c90ecb3d04190b82d5b222c75ba4cab83383dde4d11ed512",
4040
"8c5eaec000788d41",
41-
"99ee3c3e67abe0ee677903379fe4846b2c04b2e9582dfe2a73bea357a9943aae",
42-
"a3e50b3bab6dd19500d550d3494d9a20050b7679554ed4e43fe707223bd19591",
41+
"052f29b0ea082c24f61fc1c3384de2805fedeccd48d92b10c48ed9c09ae34f7a",
42+
"4fd5a26e463e692ebfd7db5865944fe00c4e4adae189d0fc8155e025e60692f9",
4343
},
4444
{
4545
5000000,
4646
"bc544c2baba832600013bd5d1983f592e9557d04b0fb5ef7a100434a5fc8d52a",
4747
"4617a20003ba3f25",
48-
"51428ed3f969ff0e205a3727cefa0f22b7c0d1162197158a93ad272524dfeb54",
49-
"7b19738f9876ba222334588734506913ca18c8a59c118ca93fbc6e415d154fd7",
48+
"a25fa04b54699e1db81a58501af4dda06216f7e17713406af0c9a72765a9d9c3",
49+
"00f9ac66c49a290c8befe9db144cf88a9fe5e761fa1564cecf539c13eec8d35b",
5050
},
5151
{
5252
5000001,
5353
"2cd14041cfc3bd13064cfd58e26c0bddf1e97a4202c4b8076444a7cd4515f8c3",
5454
"1af47f2007922384",
55-
"025de930a0ece09a2240822b6bdd715b481e7a2fe2f990b8aa84cf72c947029d",
56-
"6e11142c70abce99244e4332116dc61c897a44d6f8c6adb231f4d5322a3d9132",
55+
"fcd2884114f61bc39c34c4f52ee36aaf22b66037c4b523ada29efe71cb79750f",
56+
"c293d1a78b773dd1709f029347a384abc4472fe5d23f703d4757e610ae8f5bae",
5757
},
5858
{
5959
5000002,
6060
"9e79bced19062baf7c47e516ad3a1bd779222404d05b4205def30a13c7d87b5b",
6161
"c9a044201dd998f2",
62-
"30a4777f63a6a386e5523726c64c8de1a676a54c7782629f09af9d425aa93b66",
63-
"51a63f18f351ac64dc478c4e316cf3379654e60b667e6423977160041cd20cc0",
62+
"1d5b97ac3d2c6a7e5cc34d48cb05251db68db2c2d9cfc9c9c6f01146d47f6dd4",
63+
"c6d434f7ce14378855af7b370acf9085f21c0aea5c1b55d90d74968e89accfc5",
6464
},
6565
{
6666
5306861,
6767
"53a005f209a4dc013f022a5078c6b38ced76e767a30367ff64725f23ec652a9f",
6868
"d337f82001e992c5",
69-
"3431011050f134f289b001cc47cd40756fc0a341af56d12a6c883f28e4b02c35",
70-
"0195c63731e2817811a144aa32f984b9098536d70c97f9420bc93675c8e0bdf4",
69+
"e5088e744e78343b155944647ff92c625286841bd1c687a1e778778e078151ca",
70+
"9c48d5ff9744beb63214001acb735bd440ab3e153a56093a223405e32f769543",
7171
},
7272
};
7373
} // namespace

0 commit comments

Comments
 (0)