mleku/indra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ping and SendKeys made short and sweet

Browse Source
This commit is contained in:
David Vennik
2022-12-27 17:23:23 +00:00
parent f4ede551b8
commit 89166dc86c
4 changed files with 97 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/slice/interfaces_test.go
View File

@@ -24,23 +24,24 @@ func TestMessage_ToU64Slice(t *testing.T) {
}
func TestU64Slice_XOR(t *testing.T) {
const ml = 1024
var e error
var msg1 Bytes
if msg1, _, e = testutils.GenerateTestMessage(33); check(e) {
if msg1, _, e = testutils.GenerateTestMessage(ml); check(e) {
t.Error(e)
t.FailNow()
}
hash1 := sha256.Single(msg1)
uMsg1 := msg1.ToU64Slice()
var msg2 Bytes
if msg2, _, e = testutils.GenerateTestMessage(33); check(e) {
if msg2, _, e = testutils.GenerateTestMessage(ml); check(e) {
t.Error(e)
t.FailNow()
}
// log.I.S(msg2)
uMsg2 := msg2.ToU64Slice()
var msg3 Bytes
if msg3, _, e = testutils.GenerateTestMessage(33); check(e) {
if msg3, _, e = testutils.GenerateTestMessage(ml); check(e) {
t.Error(e)
t.FailNow()
}

4
pkg/wire/codec.go
View File

@@ -1,6 +1,8 @@
package wire
import (
"fmt"
"github.com/Indra-Labs/indra"
"github.com/Indra-Labs/indra/pkg/slice"
"github.com/Indra-Labs/indra/pkg/types"
@@ -101,6 +103,8 @@ func PeelOnion(b slice.Bytes, c *slice.Cursor) (on types.Onion, e error) {
}
on = o
default:
e = fmt.Errorf("message magic not found")
check(e)
return
}
return

318
pkg/wire/onion_test.go
View File

@@ -17,6 +17,57 @@ import (
log2 "github.com/cybriq/proc/pkg/log"
)
func PeelForward(t *testing.T, b slice.Bytes,
c *slice.Cursor) (fwd *forward.OnionSkin) {
var ok bool
var on types.Onion
var e error
if on, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
if fwd, ok = on.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(fwd))
t.FailNow()
}
return
}
func PeelOnionSkin(t *testing.T, b slice.Bytes,
c *slice.Cursor) (l *layer.OnionSkin) {
var ok bool
var on types.Onion
var e error
if on, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
if l, ok = on.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l))
t.FailNow()
}
return
}
func PeelConfirmation(t *testing.T, b slice.Bytes,
c *slice.Cursor) (cn *confirmation.OnionSkin) {
var ok bool
var e error
var on types.Onion
if on, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
if cn, ok = on.(*confirmation.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on))
t.FailNow()
}
return
}
func TestPing(t *testing.T) {
log2.CodeLoc = true
_, ks, e := signer.New()
@@ -44,132 +95,57 @@ func TestPing(t *testing.T) {
b := EncodeOnion(on)
c := slice.NewCursor()
var ok bool
var on0 types.Onion
if on0, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f0 *forward.OnionSkin
if f0, ok = on0.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(f0))
t.FailNow()
}
// Forward(hop[0].AddrPort).
f0 := PeelForward(t, b, c)
if hop[0].AddrPort.String() != f0.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[0].AddrPort.String(), f0.AddrPort.String())
t.FailNow()
}
var on1 types.Onion
if on1, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l0 *layer.OnionSkin
if l0, ok = on1.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l0))
t.FailNow()
}
l0.Decrypt(hop[0].HeaderPriv, b, c)
var on2 types.Onion
if on2, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f1 *forward.OnionSkin
if f1, ok = on2.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on2))
t.FailNow()
}
// OnionSkin(address.FromPubKey(hop[0].HeaderKey), set.Next()).
PeelOnionSkin(t, b, c).Decrypt(hop[0].HeaderPriv, b, c)
// Forward(hop[1].AddrPort).
f1 := PeelForward(t, b, c)
if hop[1].AddrPort.String() != f1.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[1].AddrPort.String(), f1.AddrPort.String())
t.FailNow()
}
var on3 types.Onion
if on3, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l1 *layer.OnionSkin
if l1, ok = on3.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l1))
t.FailNow()
}
l1.Decrypt(hop[1].HeaderPriv, b, c)
var on4 types.Onion
if on4, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f2 *forward.OnionSkin
if f2, ok = on4.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on2))
t.FailNow()
}
// OnionSkin(address.FromPubKey(hop[1].HeaderKey), set.Next()).
PeelOnionSkin(t, b, c).Decrypt(hop[1].HeaderPriv, b, c)
// Forward(hop[2].AddrPort).
f2 := PeelForward(t, b, c)
if hop[2].AddrPort.String() != f2.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[2].AddrPort.String(), f2.AddrPort.String())
t.FailNow()
}
var on5 types.Onion
if on5, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l2 *layer.OnionSkin
if l2, ok = on5.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l1))
t.FailNow()
}
l2.Decrypt(hop[2].HeaderPriv, b, c)
var on6 types.Onion
if on6, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f3 *forward.OnionSkin
if f3, ok = on6.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on2))
t.FailNow()
}
// OnionSkin(address.FromPubKey(hop[2].HeaderKey), set.Next()).
PeelOnionSkin(t, b, c).Decrypt(hop[2].HeaderPriv, b, c)
// Forward(client.AddrPort).
f3 := PeelForward(t, b, c)
if client.AddrPort.String() != f3.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
client.AddrPort.String(), f3.AddrPort.String())
t.FailNow()
}
var on7 types.Onion
if on7, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l3 *layer.OnionSkin
if l3, ok = on7.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l1))
t.FailNow()
}
l3.Decrypt(client.HeaderPriv, b, c)
var on8 types.Onion
if on8, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var co *confirmation.OnionSkin
if co, ok = on8.(*confirmation.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on8))
t.FailNow()
}
// OnionSkin(address.FromPubKey(client.HeaderKey), set.Next()).
PeelOnionSkin(t, b, c).Decrypt(client.HeaderPriv, b, c)
// Confirmation(id).
co := PeelConfirmation(t, b, c)
if co.ID != n {
t.Error("did not unwrap expected confirmation nonce")
t.FailNow()
}
}
func TestSendKeys(t *testing.T) {
@@ -201,16 +177,7 @@ func TestSendKeys(t *testing.T) {
var ok bool
// Forward(hop[0].AddrPort).
var on0 types.Onion
if on0, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f0 *forward.OnionSkin
if f0, ok = on0.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on0))
t.FailNow()
}
f0 := PeelForward(t, b, c)
if hop[0].AddrPort.String() != f0.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[0].AddrPort.String(), f0.AddrPort.String())
@@ -218,29 +185,10 @@ func TestSendKeys(t *testing.T) {
}
// OnionSkin(address.FromPubKey(hop[0].HeaderKey), set.Next()).
var on1 types.Onion
if on1, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l0 *layer.OnionSkin
if l0, ok = on1.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l0))
t.FailNow()
}
l0.Decrypt(hop[0].HeaderPriv, b, c)
PeelOnionSkin(t, b, c).Decrypt(hop[0].HeaderPriv, b, c)
// Forward(hop[1].AddrPort).
var on2 types.Onion
if on2, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f1 *forward.OnionSkin
if f1, ok = on2.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on2))
t.FailNow()
}
f1 := PeelForward(t, b, c)
if hop[1].AddrPort.String() != f1.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[1].AddrPort.String(), f1.AddrPort.String())
@@ -248,29 +196,10 @@ func TestSendKeys(t *testing.T) {
}
// OnionSkin(address.FromPubKey(hop[1].HeaderKey), set.Next()).
var on3 types.Onion
if on3, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l1 *layer.OnionSkin
if l1, ok = on3.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l1))
t.FailNow()
}
l1.Decrypt(hop[1].HeaderPriv, b, c)
PeelOnionSkin(t, b, c).Decrypt(hop[1].HeaderPriv, b, c)
// Forward(hop[2].AddrPort).
var on4 types.Onion
if on4, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f2 *forward.OnionSkin
if f2, ok = on4.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on4))
t.FailNow()
}
f2 := PeelForward(t, b, c)
if hop[2].AddrPort.String() != f2.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[2].AddrPort.String(), f2.AddrPort.String())
@@ -278,17 +207,7 @@ func TestSendKeys(t *testing.T) {
}
// OnionSkin(address.FromPubKey(hop[2].HeaderKey), set.Next()).
var on5 types.Onion
if on5, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l2 *layer.OnionSkin
if l2, ok = on5.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l1))
t.FailNow()
}
l2.Decrypt(hop[2].HeaderPriv, b, c)
PeelOnionSkin(t, b, c).Decrypt(hop[2].HeaderPriv, b, c)
// Cipher(hdr, pld).
var onc types.Onion
@@ -311,16 +230,7 @@ func TestSendKeys(t *testing.T) {
}
// Forward(hop[3].AddrPort).
var on6 types.Onion
if on6, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f3 *forward.OnionSkin
if f3, ok = on6.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on6))
t.FailNow()
}
f3 := PeelForward(t, b, c)
if hop[3].AddrPort.String() != f3.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[3].AddrPort.String(), f3.AddrPort.String())
@@ -328,29 +238,10 @@ func TestSendKeys(t *testing.T) {
}
// OnionSkin(address.FromPubKey(hop[3].HeaderKey), set.Next()).
var on7 types.Onion
if on7, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l3 *layer.OnionSkin
if l3, ok = on7.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l3))
t.FailNow()
}
l3.Decrypt(hop[3].HeaderPriv, b, c)
PeelOnionSkin(t, b, c).Decrypt(hop[3].HeaderPriv, b, c)
// Forward(hop[4].AddrPort).
var on8 types.Onion
if on8, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f4 *forward.OnionSkin
if f4, ok = on8.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on8))
t.FailNow()
}
f4 := PeelForward(t, b, c)
if hop[4].AddrPort.String() != f4.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
hop[3].AddrPort.String(), f4.AddrPort.String())
@@ -358,29 +249,10 @@ func TestSendKeys(t *testing.T) {
}
// OnionSkin(address.FromPubKey(hop[4].HeaderKey), set.Next()).
var on9 types.Onion
if on9, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l4 *layer.OnionSkin
if l4, ok = on9.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l4))
t.FailNow()
}
l4.Decrypt(hop[4].HeaderPriv, b, c)
PeelOnionSkin(t, b, c).Decrypt(hop[4].HeaderPriv, b, c)
// Forward(client.AddrPort).
var on10 types.Onion
if on10, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var f5 *forward.OnionSkin
if f5, ok = on10.(*forward.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on10))
t.FailNow()
}
f5 := PeelForward(t, b, c)
if client.AddrPort.String() != f5.AddrPort.String() {
t.Errorf("failed to unwrap expected: '%s', got '%s'",
client.AddrPort.String(), f5.AddrPort.String())
@@ -388,30 +260,10 @@ func TestSendKeys(t *testing.T) {
}
// OnionSkin(address.FromPubKey(client.HeaderKey), set.Next()).
var on11 types.Onion
if on11, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var l5 *layer.OnionSkin
if l5, ok = on11.(*layer.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(l5))
t.FailNow()
}
l5.Decrypt(client.HeaderPriv, b, c)
PeelOnionSkin(t, b, c).Decrypt(client.HeaderPriv, b, c)
// Confirmation(id).
var on12 types.Onion
if on12, e = PeelOnion(b, c); check(e) {
t.Error(e)
t.FailNow()
}
var co *confirmation.OnionSkin
if co, ok = on12.(*confirmation.OnionSkin); !ok {
t.Error("did not unwrap expected type", reflect.TypeOf(on12))
t.FailNow()
}
co := PeelConfirmation(t, b, c)
if co.ID != n {
t.Error("did not unwrap expected confirmation nonce")
t.FailNow()

8
version.go
View File

@@ -10,11 +10,11 @@ var (
// GitRef is the gitref, as in refs/heads/branchname.
GitRef = "refs/heads/main"
// ParentGitCommit is the commit hash of the parent HEAD.
ParentGitCommit = "53dbd4139b81c5a59a5a0aafbd9514a4d8a4ecaf"
ParentGitCommit = "bf278ef76a87b4441fc682ffdcd28c358ae12af8"
// BuildTime stores the time when the current binary was built.
BuildTime = "2022-12-27T15:12:23Z"
BuildTime = "2022-12-27T17:23:23Z"
// SemVer lists the (latest) git tag on the build.
SemVer = "v0.0.243"
SemVer = "v0.0.244"
// PathBase is the path base returned from runtime caller.
PathBase = "/home/loki/src/github.com/Indra-Labs/indra/"
// Major is the major number from the tag.
@@ -22,7 +22,7 @@ var (
// Minor is the minor number from the tag.
Minor = 0
// Patch is the patch version number from the tag.
Patch = 243
Patch = 244
)
// Version returns a pretty printed version information string.