Skip to content

Use LfmbTree for locks, introducing LockIndex and an index from LockId #1652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
limemloh merged 7 commits into from
Jun 8, 2026
Merged

Use LfmbTree for locks, introducing LockIndex and an index from LockId #1652

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5870058
Use LfmbTree for locks, introducing LockIndex and an index from LockId
limemloh Jun 3, 2026
668769d
Update P11 block hashes in tests
limemloh Jun 4, 2026
7762f5e
Fix hash fixtures in remaining unit tests
limemloh Jun 4, 2026
9a61777
Merge branch 'lock-transfer' into limemloh/cor-2295-locks-real-state-…
limemloh Jun 4, 2026
03e16b4
Merge remote-tracking branch 'origin/release/p11' into limemloh/cor-2…
limemloh Jun 4, 2026
d601609
Address review comments
limemloh Jun 8, 2026
4addeb1
Introduce Loadable, Cachable, Storable and Hashable for Option<T>
limemloh Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion concordium-base
Open in desktop
Submodule concordium-base updated 1 files
+1 −1 concordium-grpc-api
14 changes: 7 additions & 7 deletions concordium-consensus/tests/consensus/ConcordiumTests/EndToEnd/CredentialDeploymentTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ testBB1 =
SP8 -> read "9edf091441b19468d82a637c270472b0474592f3089e56415e4982351b095d35"
SP9 -> read "ad588c91476f5865dabf2ffe9b6954c924479aa0a2ef4057a5b79dbc110b1219"
SP10 -> read "5272b398aa5ade5ef14c6be41d586537f5212d96ea609b414bf2051e0c3780f7"
SP11 -> read "985caa840e7db8cf1bc92c426c0c18efd8d84c2a3079963cc8a36675925a34ca"
SP11 -> read "5a286c00ef3f83a6dcb7c2e461fee2ab806217a8a5bf176d2edffc5937433139"
}
}
where
Expand Down Expand Up @@ -140,7 +140,7 @@ testBB2 =
SP8 -> read "7ead7edff60ac23771f15052278304e3e2c9186826439ec7d04e28e55676f41b"
SP9 -> read "29d974384b047eaa8cb5b809dd37e9fe617e046ad22b7f9dbe605cdac9cf8e40"
SP10 -> read "29d974384b047eaa8cb5b809dd37e9fe617e046ad22b7f9dbe605cdac9cf8e40"
SP11 -> read "6cfbb4bbdde0a59c62c7235fd143bb3d4035be6944a3647230c6e6467b002958"
SP11 -> read "dca21bbc3d8ff517a94cc3f4767cd5af3c0ddc18a82f83dfd1107f3d4f30fde7"
}
}
where
Expand Down Expand Up @@ -174,7 +174,7 @@ testBB3 =
SP8 -> read "c8b3fc868c79703945638c709c9e2d03b67c3f70b023aac8ae5b980b41181726"
SP9 -> read "0282c255df3cb95180050ae3ee8838c0ab303fa7fe4e5e754ecf5d4c8db5152a"
SP10 -> read "0282c255df3cb95180050ae3ee8838c0ab303fa7fe4e5e754ecf5d4c8db5152a"
SP11 -> read "f0aa67c74436cfc94c980bde7ab17477877bedb51e65af2ee7b4d1d73d2267fc"
SP11 -> read "bf2216807a09431a102ad4e8f1eb58bdbebc7b0630b1d8f2460dcc9147f48688"
}
}
where
Expand Down Expand Up @@ -232,7 +232,7 @@ testBB2' =
SP8 -> read "3abd796108d6fdcdf8c4361973d7152973cad3695b58b0c92a4e5021c0f80e33"
SP9 -> read "e10fe99a06aec8675f442ef0232ff0af9106ad6f5845335513603bcb4f3ff707"
SP10 -> read "0182d9155fb80b22fa43b8f7e1d9da389209bfa27340ec5a823a3f587e4455f9"
SP11 -> read "058787128015e24fe915eff52ca85954744e1f370345f1b975fc86198cfe7812"
SP11 -> read "134415ff5ee3871a00805f9d99ab0d262c15c60b7dd0fc748c39a2041810ce07"
}
}
where
Expand Down Expand Up @@ -266,7 +266,7 @@ testBB3' =
SP8 -> read "9e46988a9afd8470e25c33f2133d2c10cbb38050979957f200b4aca072e3c932"
SP9 -> read "075e1732e475a84b89f1ba89c06d58df7d7e42936dc16e0cf3d8b02dacf27c52"
SP10 -> read "2a9b336c419c9e64dc7db6735a297119649c4b579ac4d32ac58e1ab09302d17c"
SP11 -> read "ccc46f1b465b4eda4d97ca9b8569fcedfc188c52faa6bcbf75459a8eab4a56d4"
SP11 -> read "72cb461a2be08aec4ba5ccba84e09300b09ee1af6912018b25ec54eab2da0e23"
}
}
where
Expand Down Expand Up @@ -298,7 +298,7 @@ testBB4 =
SP8 -> read "5bdf447992d82321a921bca9eeb6211bf3a290029164976885cf6b2fd14d923c"
SP9 -> read "ff90510a80285645170b5ff4614af366de2d8898e2bee111cae61e05ad640ada"
SP10 -> read "ff90510a80285645170b5ff4614af366de2d8898e2bee111cae61e05ad640ada"
SP11 -> read "aa25851283710d72272f03a285fdfd9ebcae508ef7d16bd6f5951042c57305af"
SP11 -> read "9f43139a2d197c7c9c839e1cef473fa5139ade2649ae800fa14c47c1e91c356e"
}
}
where
Expand Down Expand Up @@ -330,7 +330,7 @@ testBB5 =
SP8 -> read "e704583a45aec569aca9039e977d9a3a7c2db8bdfd650532182600b6a19cbb70"
SP9 -> read "6ad235a2db0349340044197b9c23da565f6bf4dd1ad40b89eab5bae7bcab0997"
SP10 -> read "6ad235a2db0349340044197b9c23da565f6bf4dd1ad40b89eab5bae7bcab0997"
SP11 -> read "3eb83f38796c308f13c39c0520e3b691acfbb04d3a2ad95286a39da09f0dcad7"
SP11 -> read "c7582c9cdf70fbb4463dce18277c1e495d2b74e3635ecfc5707e30ae5c3cf213"
}
}
where
Expand Down
8 changes: 4 additions & 4 deletions ...ium-consensus/tests/consensus/ConcordiumTests/EndToEnd/TransactionTableIntegrationTest.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ testBB1 =
SP8 -> read "6f02a3e339abab1af9d23bc74369b6e142ad3b09f4d7042d16e076e225e3753f"
SP9 -> read "27ad830abd9d1f456f2a1666365ffff1fb216911d8dab2fbae5d3ad701816733"
SP10 -> read "5634a54bfdfb954205b78129c93236fba97b3190ad3fa412b4e2ffbaad6e7324"
SP11 -> read "477b6cbbd9b72bf9589c8c351321ab4a6fac4e2d0f4151270ca722df7e8bc136"
SP11 -> read "54d0c1eac303ede359f6f5fae1d92ecd7f6d8413fec5c78c78b6c4dddba02d5c"
}
}
where
Expand Down Expand Up @@ -109,7 +109,7 @@ testBB2 =
SP8 -> read "b0c8b7a3872b7bb35a9df1f620e47f2b7dad09889b29772d7bc03d713cff862d"
SP9 -> read "3017ca78e30e5bfc25a15849c07b1266c46185340b909e26aee439ddc694af7b"
SP10 -> read "3017ca78e30e5bfc25a15849c07b1266c46185340b909e26aee439ddc694af7b"
SP11 -> read "d1ef497abc35fe056e61c60332e3925fab4ce4bb51dc916424f2a5bbd485b99b"
SP11 -> read "ce6422ea14d286970f346aa59025debb89ceb1be99324b7a9f087de4f65e91cb"
}
}
where
Expand Down Expand Up @@ -143,7 +143,7 @@ testBB3 =
SP8 -> read "8adf29ed11f4784b4b32dbf84887ff9f5dd38ef2f78dbefe579822b48acd9e51"
SP9 -> read "8935d7fb4c2906ecf1e10b225e319fb39933ca7b0970b93084e4b7b6b01a8dca"
SP10 -> read "8935d7fb4c2906ecf1e10b225e319fb39933ca7b0970b93084e4b7b6b01a8dca"
SP11 -> read "977afde3caecc14b671f315564f324fb950e7017ee5183983fb50395730ad4f4"
SP11 -> read "15279dd38b91f69114e25658e537f12fe3c4839bf56bf0bbb4249f8ba2ebab20"
}
}
where
Expand Down Expand Up @@ -176,7 +176,7 @@ testBB4 =
SP8 -> read "487c4bdf8af054727f0688bd8a7176f6c2a9c85dffc5d8acc1de23e0c3b6ef49"
SP9 -> read "fe5c4a3c4943440c34a72884ccf178af8f7b2043f0179b6bbf554574bb4ba581"
SP10 -> read "7ccdea365c8283b97af6b5d00fedc17853e84021dcbf1417c34fefbfe7736091"
SP11 -> read "ad4a9a8ad34d0877a53928530b115e340f7c28a7b4b5a32a6e1f6071e7968f56"
SP11 -> read "7871e2eace30dda1d602db9438b9a5b7ef90827e10711e0a282017ad421815f1"
}
}
where
Expand Down
2 changes: 1 addition & 1 deletion concordium-consensus/tests/consensus/ConcordiumTests/KonsensusV1/CatchUp.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ hashesRound4Block sProtocolVersion = case sBlockHashVersionFor sProtocolVersion
spv
| TestBlocks.blockResultHashAsP9 spv ->
read "93837fbd7183afca6f32723f44f13f68a980b30e832ff93b5ed1c7a5e19ecdaa"
SP11 -> read "1c90ffc50d99067cca86d9b971692fa721ba17e5bcaf3921ee832b34737491cd"
SP11 -> read "8fef1fa579c3fa44a592592f5b5c683e05188927cd147b680b8f1c70e39129b6"
spv -> TestBlocks.dummyBRH spv 0xc04
}

Expand Down
Loading
Loading