Merge branch 'develop'

[nncp.git] / src / check.go

diff --git a/src/check.go b/src/check.go
index 5872a1ffd8282cf8639c7ec786590ea4e1fc41af..a4e0d06d31ea7cc51048acb4ec8b0d7a5a0dbd9f 100644 (file)
--- a/src/check.go
+++ b/src/check.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -37,10 +37,14 @@ func Check(
        showPrgrs bool,
 ) (bool, error) {
        hsh := MTHNew(size, 0)
-       if _, err := CopyProgressed(hsh, bufio.NewReaderSize(src, MTHSize), "check", les, showPrgrs); err != nil {
+       if _, err := CopyProgressed(
+               hsh,
+               bufio.NewReaderSize(src, MTHBlockSize),
+               "check", les, showPrgrs,
+       ); err != nil {
                return false, err
        }
-       return bytes.Compare(hsh.Sum(nil), checksum) == 0, nil
+       return bytes.Equal(hsh.Sum(nil), checksum), nil
 }
 
 func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool {
@@ -104,12 +108,12 @@ func (ctx *Ctx) CheckNoCK(nodeId *NodeId, hshValue *[MTHSize]byte, mth MTH) (int
                gut, err = Check(fd, size, hshValue[:], les, ctx.ShowPrgrs)
        } else {
                if _, err = mth.PreaddFrom(
-                       bufio.NewReaderSize(fd, MTHSize),
+                       bufio.NewReaderSize(fd, MTHBlockSize),
                        pktName, ctx.ShowPrgrs,
                ); err != nil {
                        return 0, err
                }
-               if bytes.Compare(mth.Sum(nil), hshValue[:]) == 0 {
+               if bytes.Equal(mth.Sum(nil), hshValue[:]) {
                        gut = true
                }
        }