diff --git a/node/types/chunk.go b/node/types/chunk.go index d06982dd5..b3c923852 100644 --- a/node/types/chunk.go +++ b/node/types/chunk.go @@ -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 { @@ -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 @@ -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 { @@ -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