fixed tests failing due to circular dependencies

go.mod

@@ -29,6 +29,7 @@ require (
 	golang.zx2c4.com/wireguard v0.0.0-20230216153314-c7b76d3d9ecd
 	google.golang.org/grpc v1.53.0
 	google.golang.org/protobuf v1.28.1
+	gopkg.in/macaroon.v2 v2.1.0
 	gopkg.in/src-d/go-git.v4 v4.13.1
 )
 
@@ -248,7 +249,6 @@ require (
 	gopkg.in/errgo.v1 v1.0.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/macaroon-bakery.v2 v2.3.0 // indirect
-	gopkg.in/macaroon.v2 v2.1.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

pkg/b32/based32/based32_test.go

@@ -98,38 +98,38 @@ func TestCodec(t *testing.T) {
 		}
 	}
 	encodedStr := []string{
-		"lxjjvwo6rqldagjswzpqzzokmagvtwrl9snltanumznaqp6vikrjoja",
-		"mhzfed2jv3oz2llaqxczpla4i3yaoomslevvsm9opuovs65hctzzwqc",
-		"toareqyfuhu3wdehvxbykkeft4wylikbkmfw5d2or6znjhyp2zn6qd4",
-		"x5bazv5sgwmhilowcgwyxxvre99rigqcus3wmgnnptgz2rugdlwfcaz",
-		"z9o9fsspjrf6zej4hfdon3rqtnku9km5m6k9qer6nh5yaz4v9raaqd9",
-		"jpkfgtrja26ksxb9vkutyieg2rgdhi3rluqsrung4ajaoxiohemafyt",
-		"naqoc9ii5rpy5vdnqhtkbwd3siopd6bflc9htj6hddoopdnn92pp3zu",
-		"qxbsn4godjn25wyt6pctuuccoypfyg5m45nnoofvmt3gr3szjanslus",
-		"u2dcnfildfbtteyr4ykeubxfholqosujywmp2z4uy3rcb2zdzlswnai",
-		"zyfjb2eyoiemc2hua25zpd2ojjuc4x2p3asmbszqmf4lb3enkwhwgg5",
-		"ij23pwdps56gep4vhe5g6uijswvscvtmjqvzpyouj22wtjjy55i3mno",
-		"p9rixxczgbuhcyv2mirgzpelkhuy44q4djnhz2qanv3nol5y4x5tdep",
-		"t495jj4h2weqzxgg9qrv9qxm3zcufupt2m6rgmnjvoezwefvhcf2v45",
-		"vnzzjjbar6maytbvtdlhxfxy2wdicqlhbfemsmhy6sf95ocpytfukaq",
-		"z9qiupizgrjim2shcbzcwp4f3ufblbbwi2eit9prlzarc9q9gsetxo5",
-		"isp43dj4uqxx369ams9klrvm49rznpworms9wbmmeutd25kelbx53f5",
-		"pmje5okkmiegmwsblgrjuyrfiegqs9fb5euprzq5ttlgrb4irfj6s32",
-		"qbgor3a4i93brlybysrjqvo96tzoid3fw4x6sv9oieo2olnbubxf3xs",
-		"xneo99s54xzdff3ehfhmybyweqoebupzmdgfrhwhy465numhjpnep3y",
-		"2kdk4lpeug6fuz94tdw2fb5gh92pyovg33eivtcljnvfv6jbtof3zsm",
-		"k3zam9vperbqadfdn3hmexm494lbd2kkjlf64xpdtwkob6i2d93d5zo",
-		"o6ukhbw2zehqqrxrfi4vfdsk2m4zmup5svrqupkkduaooti4hxocgwt",
-		"s9jii3naicjtatu5vnoh2trtc39qoptmqvqjsb3gxrxusf2cplzvtpq",
-		"uax3ax3gpipd4ehhimnrwx2toc3gxwhblyxcxj9tu6sarjsfdsyl5gl",
-		"2lqi9mozd3pjhvhcuxgmjxby9uoglbotxdkmc3mcaylmvf2xfs2jls9",
-		"itdj2ndx5enkxvlgjrdwfftepve2nqd4tc9zzltx9l6xlrt42pk9zcg",
-		"p4lyqc63oveii9xwjzgjhlzjfofzug32oolmbee5hb9nobiwmqpgjq3",
-		"tmkf55keaq6hr342bg9rnqdgdc3phj4yxg5cvxin6z2b6zuwahsixay",
-		"vodqhkmi4gjtv56wwlkgwn6gx6zxncvwceaghcfg2fzskgoispki5hj",
-		"2b3o6v62tdhpyljqaw6brfwc5rdb9som492fg4ad6633y9hpvgmmfq9",
-		"ijliatq5ge53rkq65fcuzxwbeuqh9qoyb256kbgcsh2scakvez3g3nb",
-		"ng3mjm3wfkoab594w9anjsbxm5hs62n5kuui9jpnvg653j9nlicwbv5",
+		"alxjjvwo7rqldagjswzpqzzokmagvtwrl9snltanumznaqp7vikrjoj",
+		"amhzfed2jv3oz2llaqxczpla4i3yaoomslevvsm9opuovs76hctzzwq",
+		"atoareqyfuhu3wdehvxbykkeft4wylikbkmfw6d2or7znjhyp2zn7qd",
+		"ax6bazv6sgwmhilowcgwyxxvre99rigqcus3wmgnnptgz2rugdlwfca",
+		"az9o9fsspjrf7zej4hfdon3rqtnku9km6m7k9qer7nh6yaz4v9raaqd",
+		"ajpkfgtrja27ksxb9vkutyieg2rgdhi3rluqsrung4ajaoxiohemafy",
+		"anaqoc9ii6rpy6vdnqhtkbwd3siopd7bflc9htj7hddoopdnn92pp3z",
+		"aqxbsn4godjn26wyt7pctuuccoypfyg6m46nnoofvmt3gr3szjanslu",
+		"au2dcnfildfbtteyr4ykeubxfholqosujywmp2z4uy3rcb2zdzlswna",
+		"azyfjb2eyoiemc2hua26zpd2ojjuc4x2p3asmbszqmf4lb3enkwhwgg",
+		"aij23pwdps67gep4vhe6g7uijswvscvtmjqvzpyouj22wtjjy66i3mn",
+		"ap9rixxczgbuhcyv2mirgzpelkhuy44q4djnhz2qanv3nol6y4x6tde",
+		"at496jj4h2weqzxgg9qrv9qxm3zcufupt2m7rgmnjvoezwefvhcf2v4",
+		"avnzzjjbar7maytbvtdlhxfxy2wdicqlhbfemsmhy7sf96ocpytfuka",
+		"az9qiupizgrjim2shcbzcwp4f3ufblbbwi2eit9prlzarc9q9gsetxo",
+		"aisp43dj4uqxx379ams9klrvm49rznpworms9wbmmeutd26kelbx63f",
+		"apmje6okkmiegmwsblgrjuyrfiegqs9fb6euprzq6ttlgrb4irfj7s3",
+		"aqbgor3a4i93brlybysrjqvo97tzoid3fw4x7sv9oieo2olnbubxf3x",
+		"axneo99s64xzdff3ehfhmybyweqoebupzmdgfrhwhy476numhjpnep3",
+		"a2kdk4lpeug7fuz94tdw2fb6gh92pyovg33eivtcljnvfv7jbtof3zs",
+		"ak3zam9vperbqadfdn3hmexm494lbd2kkjlf74xpdtwkob7i2d93d6z",
+		"ao7ukhbw2zehqqrxrfi4vfdsk2m4zmup6svrqupkkduaooti4hxocgw",
+		"as9jii3naicjtatu6vnoh2trtc39qoptmqvqjsb3gxrxusf2cplzvtp",
+		"auax3ax3gpipd4ehhimnrwx2toc3gxwhblyxcxj9tu7sarjsfdsyl6g",
+		"a2lqi9mozd3pjhvhcuxgmjxby9uoglbotxdkmc3mcaylmvf2xfs2jls",
+		"aitdj2ndx6enkxvlgjrdwfftepve2nqd4tc9zzltx9l7xlrt42pk9zc",
+		"ap4lyqc73oveii9xwjzgjhlzjfofzug32oolmbee6hb9nobiwmqpgjq",
+		"atmkf66keaq7hr342bg9rnqdgdc3phj4yxg6cvxin7z2b7zuwahsixa",
+		"avodqhkmi4gjtv67wwlkgwn7gx7zxncvwceaghcfg2fzskgoispki6h",
+		"a2b3o7v72tdhpyljqaw7brfwc6rdb9som492fg4ad7733y9hpvgmmfq",
+		"aijliatq6ge63rkq76fcuzxwbeuqh9qoyb267kbgcsh2scakvez3g3n",
+		"ang3mjm3wfkoab694w9anjsbxm6hs72n6kuui9jpnvg763j9nlicwbv",
 	}
 	
 	encoded := "\nencodedStr := []string{\n"

pkg/util/slice/interfaces_test.go

@@ -3,15 +3,14 @@ package slice
 import (
 	"bytes"
 	"testing"
-
+	
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/util/tests"
 )
 
 func TestMessage_ToU64Slice(t *testing.T) {
 	var e error
 	var msg1 Bytes
-	if msg1, _, e = tests.GenMessage(33, ""); check(e) {
+	if msg1, _, e = GenMessage(33, ""); check(e) {
 		t.Error(e)
 		t.FailNow()
 	}
@@ -27,21 +26,21 @@ func TestU64Slice_XOR(t *testing.T) {
 	const ml = 1024
 	var e error
 	var msg1 Bytes
-	if msg1, _, e = tests.GenMessage(ml, ""); check(e) {
+	if msg1, _, e = GenMessage(ml, ""); check(e) {
 		t.Error(e)
 		t.FailNow()
 	}
 	hash1 := sha256.Single(msg1)
 	uMsg1 := msg1.ToU64Slice()
 	var msg2 Bytes
-	if msg2, _, e = tests.GenMessage(ml, ""); check(e) {
+	if msg2, _, e = GenMessage(ml, ""); check(e) {
 		t.Error(e)
 		t.FailNow()
 	}
 	// log.I.S(msg2)
 	uMsg2 := msg2.ToU64Slice()
 	var msg3 Bytes
-	if msg3, _, e = tests.GenMessage(ml, ""); check(e) {
+	if msg3, _, e = GenMessage(ml, ""); check(e) {
 		t.Error(e)
 		t.FailNow()
 	}

pkg/util/slice/slice_test.go

@@ -1,11 +1,11 @@
 package slice
 
 import (
+	"crypto/rand"
 	"errors"
 	"testing"
-
+	
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/util/tests"
 )
 
 func TestSize24(t *testing.T) {
@@ -24,7 +24,7 @@ func TestSegment(t *testing.T) {
 	var msg []byte
 	var hash sha256.Hash
 	var e error
-	if msg, hash, e = tests.GenMessage(msgSize, ""); check(e) {
+	if msg, hash, e = GenMessage(msgSize, ""); check(e) {
 		t.Error(e)
 	}
 	segs := Segment(msg, segSize)
@@ -34,5 +34,19 @@ func TestSegment(t *testing.T) {
 		t.Error(errors.New("message did not decode" +
 			" correctly"))
 	}
-
+	
+}
+
+func GenMessage(msgSize int, hrp string) (msg []byte, hash sha256.Hash, e error) {
+	msg = make([]byte, msgSize)
+	var n int
+	if n, e = rand.Read(msg); check(e) && n != msgSize {
+		return
+	}
+	if hrp == "" {
+		hrp = "payload"
+	}
+	copy(msg, hrp)
+	hash = sha256.Single(msg)
+	return
 }