status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

align field name across `SomeSig` (#6348) 

`ValidatorSig` uses `blob` but `TrustedSig` uses `data`, aligning the
names reduces code duplication and improves clarity. It also simplifies
`StableContainer` compatibility checks.
This commit is contained in:
Etan Kissling 2024-06-13 15:11:04 +02:00 committed by GitHub
parent 3d65bdcb09
commit 20af24efdb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_chain/spec/crypto.nim
View File

@ -77,7 +77,7 @@ type
BlsResult*[T] = Result[T, cstring] BlsResult*[T] = Result[T, cstring]
TrustedSig* = object TrustedSig* = object
data* {.align: 16.}: array[RawSigSize, byte] blob* {.align: 16.}: array[RawSigSize, byte]
SomeSig* = TrustedSig | ValidatorSig SomeSig* = TrustedSig | ValidatorSig
@ -391,12 +391,9 @@ func toRaw*(x: ValidatorPrivKey): array[32, byte] =
static: doAssert BLS_BACKEND == BLST static: doAssert BLS_BACKEND == BLST
result = SecretKey(x).exportRaw() result = SecretKey(x).exportRaw()
template toRaw*(x: ValidatorPubKey | ValidatorSig): auto = template toRaw*(x: ValidatorPubKey | SomeSig): auto =
x.blob x.blob
template toRaw*(x: TrustedSig): auto =
x.data
func toHex*(x: BlsCurveType): string = func toHex*(x: BlsCurveType): string =
toHex(toRaw(x)) toHex(toRaw(x))
@ -507,7 +504,7 @@ template fromSszBytes*(T: type[ValidatorPubKey | ValidatorSig], bytes: openArray
# Logging # Logging
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
func shortLog*(x: ValidatorPubKey | ValidatorSig): string = func shortLog*(x: ValidatorPubKey | SomeSig): string =
## Logging for wrapped BLS types ## Logging for wrapped BLS types
## that may contain valid or non-validated data ## that may contain valid or non-validated data
byteutils.toHex(x.blob.toOpenArray(0, 3)) byteutils.toHex(x.blob.toOpenArray(0, 3))
@ -520,9 +517,6 @@ func shortLog*(x: ValidatorPrivKey): string =
## Logging for raw unwrapped BLS types ## Logging for raw unwrapped BLS types
"<private key>" "<private key>"
func shortLog*(x: TrustedSig): string =
byteutils.toHex(x.data.toOpenArray(0, 3))
# Initialization # Initialization
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------