From 75a75446bb51934dd939afc6f1a4bae154b77083 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Thu, 21 Dec 2023 10:07:34 -0600 Subject: [PATCH] fix merge issues and cleanup a few warnings --- codex/merkletree/codex/codex.nim | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/codex/merkletree/codex/codex.nim b/codex/merkletree/codex/codex.nim index bdc67df8..887bb1e1 100644 --- a/codex/merkletree/codex/codex.nim +++ b/codex/merkletree/codex/codex.nim @@ -140,20 +140,8 @@ proc `$`*(self: CodexTree): string = ", leavesCount: " & $self.leavesCount & " )" -proc `==`*(a, b: CodexMerkleProof): bool = - (a.mcodec == b.mcodec) and - (a.nleaves == b.nleaves) and - (a.path == b.path) and - (a.index == b.index) - -proc `$`*(self: CodexMerkleTree): string = - "CodexMerkleTree( mcodec: " & - $self.mcodec & - ", leavesCount: " & - $self.leavesCount & " )" - -proc `$`*(self: CodexMerkleProof): string = - "CodexMerkleProof( mcodec: " & +proc `$`*(self: CodexProof): string = + "CodexProof( mcodec: " & $self.mcodec & ", nleaves: " & $self.nleaves & ", index: " & $self.index & " )"