From f99525fb3570c23872b2ea85cd045ad18e8c1715 Mon Sep 17 00:00:00 2001 From: Islam Aleiv Date: Tue, 25 Jun 2024 12:59:31 +0200 Subject: [PATCH] Polish --- internal/merkle/clock/clock.go | 9 ++++----- internal/merkle/crdt/merklecrdt.go | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/internal/merkle/clock/clock.go b/internal/merkle/clock/clock.go index f8d7449ca4..5c960b4c29 100644 --- a/internal/merkle/clock/clock.go +++ b/internal/merkle/clock/clock.go @@ -147,7 +147,6 @@ func (mc *MerkleClock) checkIfBlockEncryptionEnabled( if prevBlock.IsEncrypted != nil && *prevBlock.IsEncrypted { return true, nil } - // could do block.EncryptDelta(encKey) } return false, nil @@ -172,10 +171,10 @@ func (mc *MerkleClock) ProcessBlock( onlyHeads bool, ) error { if !onlyHeads { - err := mc.crdt.Merge(ctx, block.Delta.GetDelta()) - if err != nil { - return NewErrMergingDelta(blockLink.Cid, err) - } + err := mc.crdt.Merge(ctx, block.Delta.GetDelta()) + if err != nil { + return NewErrMergingDelta(blockLink.Cid, err) + } } return mc.updateHeads(ctx, block, blockLink) diff --git a/internal/merkle/crdt/merklecrdt.go b/internal/merkle/crdt/merklecrdt.go index 85e42952cf..ef8adff191 100644 --- a/internal/merkle/crdt/merklecrdt.go +++ b/internal/merkle/crdt/merklecrdt.go @@ -48,7 +48,7 @@ type MerkleClock interface { links ...coreblock.DAGLink, ) (cidlink.Link, []byte, error) // ProcessBlock processes a block and updates the CRDT state. - // The bool argument indicates whether only heads need to be updated. It is needed in case + // The bool argument indicates whether only heads need to be updated. It is needed in case // merge should be skipped for example if the block is encrypted. ProcessBlock(context.Context, *coreblock.Block, cidlink.Link, bool) error }