Skip to content

change to not use reserved words for variables #130

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
FletcherMan merged 1 commit into from
Mar 18, 2024
Merged

change to not use reserved words for variables #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions node/types/chunk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,12 @@ func (ck *Chunk) Decode(chunkBytes []byte) error {
}

func (ck *Chunk) Hash() common.Hash {
var bytes []byte
var bz []byte
for i := 0; i < ck.blockNum; i++ {
bytes = append(bytes, ck.blockContext[i*60:i*60+58]...)
bz = append(bz, ck.blockContext[i*60:i*60+58]...)
}
bytes = append(bytes, ck.txHashes...)
return crypto.Keccak256Hash(bytes)
bz = append(bz, ck.txHashes...)
return crypto.Keccak256Hash(bz)
}

type Chunks struct {
Expand Down Expand Up @@ -233,8 +233,8 @@ func (cks *Chunks) Append(blockContext, txsPayload []byte, txHashes []common.Has
return
}
lastChunk := cks.data[len(cks.data)-1]
accRc, max := lastChunk.accumulateRowUsages(rc)
if lastChunk.blockNum+1 > MaxBlocksPerChunk || max > NormalizedRowLimit { // add a new chunk
accRc, maxRowUsages := lastChunk.accumulateRowUsages(rc)
if lastChunk.blockNum+1 > MaxBlocksPerChunk || maxRowUsages > NormalizedRowLimit { // add a new chunk
lastChunk.Seal()
cks.data = append(cks.data, NewChunk(blockContext, txsPayload, txHashes, l2TxHashes, rc))
cks.size += 1
Expand All @@ -245,37 +245,37 @@ func (cks *Chunks) Append(blockContext, txsPayload []byte, txHashes []common.Has
}

func (cks *Chunks) Encode() ([][]byte, error) {
var bytes [][]byte
var bytesArray [][]byte
for _, ck := range cks.data {
ckBytes, err := ck.Encode()
if err != nil {
return nil, err
}
bytes = append(bytes, ckBytes)
bytesArray = append(bytesArray, ckBytes)
}
return bytes, nil
return bytesArray, nil
}

func (cks *Chunks) TxPayload() []byte {
var bytes []byte
var bz []byte
for _, ck := range cks.data {
bytes = append(bytes, ck.txsPayload...)
bz = append(bz, ck.txsPayload...)
}
return bytes
return bz
}

func (cks *Chunks) SealTxPayloadForBlob() []byte {
var bytes []byte
var bz []byte
for _, ck := range cks.data {
if !ck.Sealed() {
ck.Seal()
}
bytes = append(bytes, ck.sealedPayload...)
bz = append(bz, ck.sealedPayload...)
}
if IsAllZero(bytes) {
bytes = nil
if IsAllZero(bz) {
bz = nil
}
return bytes
return bz
}

func (cks *Chunks) DataHash() common.Hash {
Expand Down Expand Up @@ -318,8 +318,8 @@ func (cks *Chunks) IsChunksAppendedWithNewBlock(blockRc types.RowConsumption) (a
if lastChunk.blockNum+1 > MaxBlocksPerChunk {
return true, addedZeroNum(len(lastChunk.txsPayload) + 4) // the extra 4 bytes to store the size of the txsPayload
}
_, max := lastChunk.accumulateRowUsages(blockRc)
if max > NormalizedRowLimit {
_, maxRowUsages := lastChunk.accumulateRowUsages(blockRc)
if maxRowUsages > NormalizedRowLimit {
return true, addedZeroNum(len(lastChunk.txsPayload) + 4)
}
return false, 0
Expand Down