Forbid any later GNU GPL versions autousage

[nncp.git] / src / cypherpunks.ru / nncp / tx_test.go

diff --git a/src/cypherpunks.ru/nncp/tx_test.go b/src/cypherpunks.ru/nncp/tx_test.go
index d97be3debc487f5955388b4a7808e333745d6492..bde218f99043413a8be2134b533567fe1172e6a5 100644 (file)
--- a/src/cypherpunks.ru/nncp/tx_test.go
+++ b/src/cypherpunks.ru/nncp/tx_test.go
@@ -1,11 +1,10 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2018 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2019 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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,7 +32,7 @@ import (
 )
 
 func TestTx(t *testing.T) {
-       f := func(hops uint8, pathSrc, data string, nice uint8, padSize int16) bool {
+       f := func(hops uint8, pathSrc, data string, nice, replyNice uint8, padSize int16) bool {
                if len(pathSrc) > int(MaxPathSize) {
                        pathSrc = pathSrc[:MaxPathSize]
                }
@@ -76,7 +75,7 @@ func TestTx(t *testing.T) {
                        privates[*node.Id] = node
                        nodeTgt.Via = append(nodeTgt.Via, node.Id)
                }
-               pkt, err := NewPkt(PktTypeMail, pathSrc)
+               pkt, err := NewPkt(PktTypeExec, replyNice, []byte(pathSrc))
                src := strings.NewReader(data)
                dstNode, err := ctx.Tx(
                        nodeTgt,
@@ -121,7 +120,10 @@ func TestTx(t *testing.T) {
                                return false
                        }
                        if *hopId == *nodeTgt.Id {
-                               if pkt.Type != PktTypeMail {
+                               if pkt.Type != PktTypeExec {
+                                       return false
+                               }
+                               if pkt.Nice != replyNice {
                                        return false
                                }
                                if !bytes.HasPrefix(pkt.Path[:], []byte(pathSrc)) {