Skip to content

Commit

Permalink
Merge pull request #7 from HerodotusDev/rust-migrate
Browse files Browse the repository at this point in the history
update ci, cleanup fixture
  • Loading branch information
rkdud007 authored May 8, 2024
2 parents 4f22435 + aaf449d commit de8e52d
Show file tree
Hide file tree
Showing 19 changed files with 7 additions and 74 deletions.
40 changes: 2 additions & 38 deletions Makefile.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
[env]
CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true

[tasks.clone-hdp-cairo]
workspace = false
description = "Clone the hdp-cairo repository. Ignores errors if the clone operation fails."
ignore_errors = true
command = "git"
args = ["clone", "https://github.com/HerodotusDev/hdp-cairo.git"]

[tasks.clone-hdp-cli]
workspace = false
description = "Clone the hdp-cairo repository. Ignores errors if the clone operation fails."
ignore_errors = true
command = "git"
args = ["clone", "https://github.com/HerodotusDev/hdp.git"]

[tasks.cairo-setup]
workspace = false
description = "Set up the Cairo environment by running the setup script."
Expand All @@ -23,25 +9,10 @@ echo "Setting up the environment..."
./scripts/setup_cairovm.sh
'''

[tasks.cli-setup]
workspace = false
description = "Set up the HDP binary to be used in the integration tests."
script = '''
cd hdp && cargo install --path cli -f && cd ..
'''

[tasks.cairo-compile]
workspace = false
description = "Compile the HDP Cairo program. This step requires the setup task to be completed first."
script = '''
echo "Compiling the program..."
./scripts/compile.sh
'''

[tasks.integration-test]
workspace = false
description = "Run integration tests. Specify the folder name through the INTEGRATION_ARGS environment variable."
env = { INTEGRATION_ARGS = "account" }
env = { INTEGRATION_ARGS = "header account" }
script = '''
echo "Running integration tests with arguments: $INTEGRATION_ARGS"
chmod +x ./scripts/integration.sh
Expand All @@ -62,14 +33,7 @@ rm -rf tools
[tasks.run-full-flow]
workspace = false
description = "Execute the full integration test flow, including cloning, setup, compilation, and testing."
dependencies = [
"clone-hdp-cairo",
"clone-hdp-cli",
"cli-setup",
"cairo-setup",
"cairo-compile",
"integration-test",
]
dependencies = ["cairo-setup", "integration-test"]

[config]
unstable_features = ["CTRL_C_HANDLING"]
5 changes: 0 additions & 5 deletions fixtures/header/1/err.md

This file was deleted.

1 change: 1 addition & 0 deletions fixtures/header/1/input.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"results_root":{"low":"0xadab387abb43162ca5c086ba74ab82d1","high":"0x8e8ac359394216d68367b73ad19b4976"},"tasks_root":{"low":"0xd5b0d0081c091c6aa83b7d0428224781","high":"0xdae226a00e394ab93d0745a215796c89"},"headers":[{"rlp":["0x3eff7c3ca06502f9","0x842b8606c363c45e","0x4e9fe4c17949753d","0x408b7862caaa5902","0x4dcc1da0eb367519","0xb585ab7a5dc7dee8","0x4512d31ad4ccb667","0x42a1f013748a941b","0x944793d440fd","0x3f33827ba8166900","0x9437b22366044542","0xe23f04c67a05cc6","0xfbe285aac4b842d0","0xbf72ff1fc1b1b9f0","0xb368b7896ff00c8e","0xedccd5c8a0a6dfca","0x2cebaa955fa512b4","0x38c3284b518cba00","0x204fc8fb8302494","0xfa892aa0f7522928","0x4f65f0ce974436f9","0x23858703953b90a8","0x7fb5416d3973562b","0x1b93fa3d77916","0xdd40044c0f1a0288","0x980680b303b01071","0x604016800dc00180","0x1802fc4438108046","0xd1640ac00004121","0x86024460449ce8ba","0x4013ea06a2096046","0x4501a06901108285","0x22a247002ba00110","0x818081060f024840","0x2040808514044484","0x804460c401210c58","0xb44245060a407008","0x4728821655468884","0x60c46081d0448aa4","0x34046a8096c09245","0x421e08004440142","0x88428208a8150137","0x50d4008825483340","0x810418df1f19b50","0x2e48a4ec0200080e","0x1ace24200140a148","0x9a4c1290314b0e","0x3288012322281b4","0x70900c0203109305","0x92173e01008c01","0xe87e0109c162092","0xd2084c180d10002","0x12a1efa42254b5","0x40000a400091901","0x728224489202120e","0xed722c039e22e0a0","0xc901849306508380","0x65840dd0d28380c3","0xd0183d89938b8c4","0x678868746567840c","0x85332e30322e316f","0x4636a078756e696c","0x49dc58009d5b433f","0xbec7b618a1d7c51","0xdc9b8a96e7165bd0","0x88c66c0ac4cc48","0x8500000000000000","0x7ddba0d31b3dda11","0xc20637ed7f2149d0","0x3951f80d44f74f3d","0x411ca801d7d02de1","0x283d1062512afc6","0xa00000c204840000","0xd894a9c1a8276af6","0xd15dca03e7d05255","0x21176878b48b0d69","0x5e453297e2e5cf4f"],"rlp_bytes_len":616,"proof":{"leaf_idx":384121,"mmr_path":["0x00512e932ba53ce6ed6874de47ed3ab838734cea26a26bdf63fb0271025dd46","0x3279924dbfc84fedc7bf3033f6f364dac6c389ef08a4173b31f2020d3cb5cbb","0x231caa6fc8e1ba08977adb10dfdd2148fa320ea54b3430dc91624cde819a68c","0x13160b2c95b45242a716d20117f11aaed7962eaf47a95bf9f412c0059f2fac4","0x1c7708a67de504cf146cbf7ea4c10f34fc4c8ac2d0e2377acd03077a0a4d007","0x20c2f16c976da7a9d5f534ebd54d8e4a7b21be9a8e322bcb5731bab2d4f7622","0x32d4b4ce6370b02a991726dedde00ee6d6067de2440f33c777fd640d36bb734","0x4c42a372d791949db75ef9fc3d80ac0e385e407af1f54b74fa8c33624ded571","0x1c66d3b3799163ece3bc02868dabe3b99ed1f1b9131a3913f538fcdb1959116","0x2904a1bab42681743cfff9bf2f8647e76db1bfb359636dbfc597bf1e04ddf30","0x3adadb7141c219ab173306cef38a8e2ddfc351a1a949655d13abf96522f86af","0x2aaabf5333f3a36f8e24817225ffc5638aff2703f3b74806e26c93baefb365e","0x7ae823d313ff1583b1f880c7a36863c10ea6f17b81f4dbf6166cd4212bc3697","0x29ada5eae9ddc201936c4b07500f11860bc7494e977d841e76054932b6c7e13","0x57633d913c08c57441cc7c302b9c3de34024a7abc95b756b159b958707a1f64","0x0b3e9fb1f9acc347128af1e8d6c2077a53c54496cd0f516213eed72fc48eea9","0x7fb7bd30fbf6c11ffe4ee96ae7c5ce9d374da4330f3989cf68070c7893a89e2","0x47049465af6d5adc3fc6ed6703ead93847485e523f93f4e5a182da45731995b","0x605d582cc7c385c3cdef4a3db78ef104492e7f89a24a839e3ceef8f4f9309ba"]}},{"rlp":["0xcf7d1a34a06602f9","0x38648c367e51ade","0xd4c36439ed030e74","0x97cf26b8e579352","0x4dcc1da0731270c0","0xb585ab7a5dc7dee8","0x4512d31ad4ccb667","0x42a1f013748a941b","0xbfc4944793d440fd","0x334f466e8d66b1cc","0x41d3d7c8d8ad6ba7","0xd935b65f31a04ae0","0x9fb09830506cc9cc","0xb612a25a60badcb5","0x21a55b2b2681c0b2","0x99ce6550a009059b","0xdbcb4f39e255a87b","0x7dd4f21d2a60485a","0x7a103ca8ce5c546e","0x173a76a025e79350","0xf428136a866d0da5","0xded7c311deda0a39","0xdbffa96a25a30302","0x1b98c69d963c7","0xf04400bc26112088","0x5985015100041c23","0x4181d01080066082","0xb2b06b4698808022","0x150244c5c0610022","0x5200040041a8a099","0x8bff20206012a03","0x820324d02a0b2325","0x102832013810098","0x9308d00198000805","0x180843444100180","0x4844c081a0b398","0x1862650728c0688c","0x4629811cc5c280e4","0x450203b8c0040404","0x61c4de80138e0201","0x412808d2c006c1a","0x840a04080a1101a0","0x444008085502100","0x15af4859590d039","0xe9aa5482b22190e","0x1ac41020003890e4","0x148800e50202d1cf","0x922080172864196c","0x40c8183293149240","0x50368001001801","0x66c052153c116438","0x1960905800928420","0xe9a0ae20ec45036","0x2c40c381004001c5","0x5c4124c41842b00c","0x8457e0000d0a43f0","0xc90184cc06508380","0x846c5f0c018480c3","0x183d8992cbbc465","0x8868746567840b0d","0x332e31322e316f67","0xf4a078756e696c85","0x2504141e2eef413d","0x459f379c11dff259","0x7800b5ea2fe31252","0x88bcc5d2d86b0438","0x0","0xb7a08f59fc141185","0x725c9aff39fb97ac","0xacbb582741be925d","0xb4d95c7065fe4cd4","0x839d2995f32b4fd1","0xb60484000008","0x74af1975013088a0","0xf777d0476bc0dcb","0x8066c4368aedee40","0x2ef68d2315d2b5e4","0x7f"],"rlp_bytes_len":617,"proof":{"leaf_idx":384433,"mmr_path":["0x52dcb63d8023f2905c7dfdf481947abdb204d29fb85fd5aa6ea605d0851a78c","0x4b20a449d974ba8a1b6eab429823158759a76dc82f0f43c932ae804f19ac60f","0x32272531e4d32b073a7fe6d13c0674b2d2482eec06f64ed3788f6082e53a03d","0x23a1ff4ae49e4bc32f70d32076d6028f574f15fd52d234ce73ad841fbb2ba7f","0x464e2e1ddb59dbe848e18f5f52eb87557d0f8ed0fad2655664e737ced1ddd38","0x7d98c56d05c72bcfe70ab15f7c4c2d1ee949a2fd083fc29d599d66a015a8d66","0x4061f20fe705b731496b11129f1a4859ae3d63051d68cb80a810af56755506b","0x0a1b38a4b1a9e361da81827eaee035757f074c9d0c103b9acbb96ed92a0fa5f","0x1c66d3b3799163ece3bc02868dabe3b99ed1f1b9131a3913f538fcdb1959116","0x2904a1bab42681743cfff9bf2f8647e76db1bfb359636dbfc597bf1e04ddf30","0x3adadb7141c219ab173306cef38a8e2ddfc351a1a949655d13abf96522f86af","0x2aaabf5333f3a36f8e24817225ffc5638aff2703f3b74806e26c93baefb365e","0x7ae823d313ff1583b1f880c7a36863c10ea6f17b81f4dbf6166cd4212bc3697","0x29ada5eae9ddc201936c4b07500f11860bc7494e977d841e76054932b6c7e13","0x57633d913c08c57441cc7c302b9c3de34024a7abc95b756b159b958707a1f64","0x0b3e9fb1f9acc347128af1e8d6c2077a53c54496cd0f516213eed72fc48eea9","0x7fb7bd30fbf6c11ffe4ee96ae7c5ce9d374da4330f3989cf68070c7893a89e2","0x47049465af6d5adc3fc6ed6703ead93847485e523f93f4e5a182da45731995b","0x605d582cc7c385c3cdef4a3db78ef104492e7f89a24a839e3ceef8f4f9309ba"]}}],"mmr":{"id":22,"root":"0x759813a2316863bbee517bc300a4141c822750ffb3b681815a099026bb0b737","size":1445327,"peaks":["0x0be44f43a7030f6d5d777c75f6989b734b5139d077222776568543002ec75bd","0x34826ebddada08c600446fc66b1b04080e9b0c9de2a9deaaf399cfb379f19af","0x0824e7ecdc8a93264092eae45aaaee9159f6dcec213a816eff3247f3dbe2793","0x6b3656423e4f6878ba5044ddb8258f1fd89a19dc56ac0dd8b12ce005e694ec0","0x632619fa96588d1a0dd1b71702d96de0e702166a259d752b87b1ddb6d89befa","0x2591f772f6dc8266031ecdc2d02a947f50ffb80bd23bdf55542b2f8b736cb5e","0x36318d80b3f259b68eeb4ff989d9f895f3f79444225a9dcff087e917993cb83","0x5e70a5f01623e64747d541cf74f6d1e605166514144b4bcc58c685d889f4962","0x60d92dfe02bb7b9c61efdde89f36514b86cf0654411effb6e2ad02fb783e199","0x345aa35ad5c6995ec7724db48c41f019cd20e3ba7a967bcb596a43b11bb811a","0x7faee671240c2ee9e2ae7c37e51d5b89bad98a924c72a3914bf1570dab52311"]},"accounts":[],"storages":[],"transactions":[],"transaction_receipts":[],"tasks":[{"task_bytes_len":128,"encoded_task":["0xfac8d74e212b5be2","0x658a4ff6cd9a62a4","0xe0ab4c3a849f9795","0xa66204efc2c91866","0x0","0x0","0x0","0x0","0x0","0x0","0x0","0x0","0x0","0x0","0x0","0x0"],"datalake_bytes_len":224,"encoded_datalake":["0x0","0x0","0x0","0x0","0x0","0x0","0x0","0x9306500000000000","0x0","0x0","0x0","0xe306500000000000","0x0","0x0","0x0","0x3900000000000000","0x0","0x0","0x0","0xa000000000000000","0x0","0x0","0x0","0x200000000000000","0x801","0x0","0x0","0x0"],"datalake_type":0,"property_type":1}]}
Loading

0 comments on commit de8e52d

Please sign in to comment.