mirror of
https://github.com/monero-project/monero.git
synced 2025-02-02 14:24:42 -05:00
resolve rebase to master issues
This commit is contained in:
parent
420b4b6a78
commit
d36b6fe96f
@ -115,12 +115,17 @@ CResult hash_grow_helios(HeliosPoint existing_hash,
|
|||||||
HeliosScalar existing_child_at_offset,
|
HeliosScalar existing_child_at_offset,
|
||||||
HeliosScalarSlice new_children);
|
HeliosScalarSlice new_children);
|
||||||
|
|
||||||
|
CResult hash_trim_helios(HeliosPoint existing_hash,
|
||||||
|
uintptr_t offset,
|
||||||
|
HeliosScalarSlice children,
|
||||||
|
HeliosScalar child_to_grow_back);
|
||||||
|
|
||||||
CResult hash_grow_selene(SelenePoint existing_hash,
|
CResult hash_grow_selene(SelenePoint existing_hash,
|
||||||
uintptr_t offset,
|
uintptr_t offset,
|
||||||
SeleneScalar existing_child_at_offset,
|
SeleneScalar existing_child_at_offset,
|
||||||
SeleneScalarSlice new_children);
|
SeleneScalarSlice new_children);
|
||||||
|
|
||||||
CResult<SelenePoint> hash_trim_selene(SelenePoint existing_hash,
|
CResult hash_trim_selene(SelenePoint existing_hash,
|
||||||
uintptr_t offset,
|
uintptr_t offset,
|
||||||
SeleneScalarSlice children,
|
SeleneScalarSlice children,
|
||||||
SeleneScalar child_to_grow_back);
|
SeleneScalar child_to_grow_back);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user