X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcheck.go;h=731e86937c55cb7b2840bbad3d2a1e67cca17398;hb=ff2139ccf41d72a3c1c4b56c2106effd1ef2e841;hp=4a1be889cb4a1777f7d6670afa483e2805b0bb5d;hpb=561313b1994a8fadac5152bbdc7a980881fd93e0;p=nncp.git diff --git a/src/check.go b/src/check.go index 4a1be88..731e869 100644 --- a/src/check.go +++ b/src/check.go @@ -27,12 +27,12 @@ import ( "golang.org/x/crypto/blake2b" ) -func Check(src io.Reader, checksum []byte, sds SDS, showPrgrs bool) (bool, error) { +func Check(src io.Reader, checksum []byte, les LEs, showPrgrs bool) (bool, error) { hsh, err := blake2b.New256(nil) if err != nil { log.Fatalln(err) } - if _, err = CopyProgressed(hsh, bufio.NewReader(src), "check", sds, showPrgrs); err != nil { + if _, err = CopyProgressed(hsh, bufio.NewReader(src), "check", les, showPrgrs); err != nil { return false, err } return bytes.Compare(hsh.Sum(nil), checksum) == 0, nil @@ -41,21 +41,21 @@ func Check(src io.Reader, checksum []byte, sds SDS, showPrgrs bool) (bool, error func (ctx *Ctx) checkXxIsBad(nodeId *NodeId, xx TRxTx) bool { isBad := false for job := range ctx.Jobs(nodeId, xx) { - sds := SDS{ - "xx": string(xx), - "node": nodeId, - "pkt": Base32Codec.EncodeToString(job.HshValue[:]), - "fullsize": job.Size, + les := LEs{ + {"XX", string(xx)}, + {"Node", nodeId}, + {"Pkt", Base32Codec.EncodeToString(job.HshValue[:])}, + {"FullSize", job.Size}, } - gut, err := Check(job.Fd, job.HshValue[:], sds, ctx.ShowPrgrs) + gut, err := Check(job.Fd, job.HshValue[:], les, ctx.ShowPrgrs) job.Fd.Close() // #nosec G104 if err != nil { - ctx.LogE("check", sds, err, "") + ctx.LogE("check", les, err, "") return true } if !gut { isBad = true - ctx.LogE("check", sds, errors.New("bad"), "") + ctx.LogE("check", les, errors.New("bad"), "") } } return isBad