moved a lot of things into relay

2023-03-01 07:16:10 +00:00
parent cde6d19b50
commit 963a44ad81
53 changed files with 169 additions and 165 deletions
--- a/cmd/indra/relay.go
+++ b/cmd/indra/relay.go
@@ -10,7 +10,7 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/interrupt"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
 	"git-indra.lan/indra-labs/indra/pkg/relay"
-	"git-indra.lan/indra-labs/indra/pkg/transport"
+	"git-indra.lan/indra-labs/indra/pkg/relay/transport"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/balance.go
+++ b/pkg/relay/balance.go
@@ -5,10 +5,10 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/signer"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/balance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/getbalance"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/balance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/codec.go
+++ b/pkg/relay/codec.go
@@ -1,7 +1,7 @@
 package relay

 import (
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/codec_test.go
+++ b/pkg/relay/codec_test.go
@@ -12,15 +12,15 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/confirm"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/delay"
-	"git-indra.lan/indra-labs/indra/pkg/messages/exit"
-	"git-indra.lan/indra-labs/indra/pkg/messages/forward"
-	"git-indra.lan/indra-labs/indra/pkg/messages/response"
-	"git-indra.lan/indra-labs/indra/pkg/messages/reverse"
-	"git-indra.lan/indra-labs/indra/pkg/messages/session"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/delay"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/exit"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/forward"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/response"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/session"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 	"git-indra.lan/indra-labs/indra/pkg/util/tests"
 )
--- a/pkg/relay/engine.go
+++ b/pkg/relay/engine.go
@@ -10,7 +10,7 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/signer"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 )

 var (
--- a/pkg/relay/engine_test.go
+++ b/pkg/relay/engine_test.go
@@ -12,9 +12,9 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/prv"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/intro"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/transport"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/intro"
+	"git-indra.lan/indra-labs/indra/pkg/relay/transport"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 	"git-indra.lan/indra-labs/indra/pkg/util/tests"
 )
--- a/pkg/relay/exit.go
+++ b/pkg/relay/exit.go
@@ -8,10 +8,10 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/signer"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/exit"
-	"git-indra.lan/indra-labs/indra/pkg/messages/response"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/exit"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/response"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/handlemessage.go
+++ b/pkg/relay/handlemessage.go
@@ -2,21 +2,21 @@ package relay

 import (
 	"reflect"
-
-	"git-indra.lan/indra-labs/indra/pkg/messages/balance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/confirm"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/delay"
-	"git-indra.lan/indra-labs/indra/pkg/messages/exit"
-	"git-indra.lan/indra-labs/indra/pkg/messages/forward"
-	"git-indra.lan/indra-labs/indra/pkg/messages/getbalance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice"
-	"git-indra.lan/indra-labs/indra/pkg/messages/intro"
-	"git-indra.lan/indra-labs/indra/pkg/messages/introquery"
-	"git-indra.lan/indra-labs/indra/pkg/messages/response"
-	"git-indra.lan/indra-labs/indra/pkg/messages/reverse"
-	"git-indra.lan/indra-labs/indra/pkg/messages/session"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/balance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/delay"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/exit"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/forward"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/intro"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/response"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/session"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/handler.go
+++ b/pkg/relay/handler.go
@@ -1,7 +1,7 @@
 package relay

 import (
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 )

 func (eng *Engine) handler() (out bool) {
--- a/pkg/relay/handlers.go
+++ b/pkg/relay/handlers.go
@@ -4,15 +4,15 @@ import (
 	"time"
 	
 	"git-indra.lan/indra-labs/indra/pkg/crypto/ciph"
-	"git-indra.lan/indra-labs/indra/pkg/messages/confirm"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/delay"
-	"git-indra.lan/indra-labs/indra/pkg/messages/forward"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
-	"git-indra.lan/indra-labs/indra/pkg/messages/response"
-	"git-indra.lan/indra-labs/indra/pkg/messages/reverse"
-	"git-indra.lan/indra-labs/indra/pkg/messages/session"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/delay"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/forward"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/response"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/session"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/hiddenservice.go
+++ b/pkg/relay/hiddenservice.go
@@ -5,9 +5,9 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/signer"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice"
-	"git-indra.lan/indra-labs/indra/pkg/messages/intro"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/intro"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/introductions.go
+++ b/pkg/relay/introductions.go
@@ -9,10 +9,10 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/signer"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/intro"
-	"git-indra.lan/indra-labs/indra/pkg/messages/introquery"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/intro"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/cryptorand"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )
--- a/pkg/relay/messages/balance/balance.go
+++ b/pkg/relay/messages/balance/balance.go
@@ -5,11 +5,11 @@ import (
 	
 	"git-indra.lan/indra-labs/indra"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/confirm/confirmation.go
+++ b/pkg/relay/messages/confirm/confirmation.go
@@ -3,11 +3,11 @@ package confirm
 import (
 	"git-indra.lan/indra-labs/indra"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/crypt/crypt.go
+++ b/pkg/relay/messages/crypt/crypt.go
@@ -9,12 +9,12 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/prv"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
-	"git-indra.lan/indra-labs/indra/pkg/messages/reverse"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/delay/delay.go
+++ b/pkg/relay/messages/delay/delay.go
@@ -4,11 +4,11 @@ import (
 	"time"
 	
 	"git-indra.lan/indra-labs/indra"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/dxresponse/dxresponse.go
+++ b/pkg/relay/messages/dxresponse/dxresponse.go
@@ -3,11 +3,11 @@ package dxresponse
 import (
 	"git-indra.lan/indra-labs/indra"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/exit/exit.go
+++ b/pkg/relay/messages/exit/exit.go
@@ -4,11 +4,11 @@ import (
 	"git-indra.lan/indra-labs/indra"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/forward/forward.go
+++ b/pkg/relay/messages/forward/forward.go
@@ -5,11 +5,11 @@ import (
 	"net/netip"
 	
 	"git-indra.lan/indra-labs/indra"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/getbalance/getbalance.go
+++ b/pkg/relay/messages/getbalance/getbalance.go
@@ -4,11 +4,11 @@ import (
 	"git-indra.lan/indra-labs/indra"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/hiddenservice/hiddenservice.go
+++ b/pkg/relay/messages/hiddenservice/hiddenservice.go
@@ -4,12 +4,12 @@ import (
 	"git-indra.lan/indra-labs/indra"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/intro"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/intro"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/intro/intro-message.go
+++ b/pkg/relay/messages/intro/intro-message.go
@@ -9,11 +9,11 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/sig"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 var (
--- a/pkg/relay/messages/intro/intro-message_test.go
+++ b/pkg/relay/messages/intro/intro-message_test.go
--- a/pkg/relay/messages/introquery/introquery.go
+++ b/pkg/relay/messages/introquery/introquery.go
@@ -5,11 +5,11 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/magicbytes/magic.go
+++ b/pkg/relay/messages/magicbytes/magic.go
--- a/pkg/relay/messages/noop/noop.go
+++ b/pkg/relay/messages/noop/noop.go
@@ -1,7 +1,7 @@
 package noop

 import (
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/messages/response/response.go
+++ b/pkg/relay/messages/response/response.go
@@ -3,11 +3,11 @@ package response
 import (
 	"git-indra.lan/indra-labs/indra"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/reverse/reverse.go
+++ b/pkg/relay/messages/reverse/reverse.go
@@ -4,11 +4,11 @@ import (
 	"net/netip"
 	
 	"git-indra.lan/indra-labs/indra"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/splice"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
+	"git-indra.lan/indra-labs/indra/pkg/util/splice"
 )

 const (
--- a/pkg/relay/messages/session/session.go
+++ b/pkg/relay/messages/session/session.go
@@ -5,10 +5,10 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/prv"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
-	"git-indra.lan/indra-labs/indra/pkg/messages/noop"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/noop"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/node.go
+++ b/pkg/relay/node.go
@@ -8,8 +8,8 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/prv"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/ring"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	ring2 "git-indra.lan/indra-labs/indra/pkg/relay/ring"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

@@ -21,12 +21,12 @@ type Node struct {
 	IdentityPub    *pub.Key
 	IdentityBytes  pub.Bytes
 	IdentityPrv    *prv.Key
-	RelayRate      int                 // Base relay price/Mb.
-	Services       Services            // Services offered by this peer.
-	HiddenServices Referrers           // Hidden services known by peer.
-	Load           *ring.BufferLoad    // Relay load.
-	Latency        *ring.BufferLatency // Latency to peer.
-	Failure        *ring.BufferFailure // Times of tx failure.
+	RelayRate      int                  // Base relay price/Mb.
+	Services       Services             // Services offered by this peer.
+	HiddenServices Referrers            // Hidden services known by peer.
+	Load           *ring2.BufferLoad    // Relay load.
+	Latency        *ring2.BufferLatency // Latency to peer.
+	Failure        *ring2.BufferFailure // Times of tx failure.
 	PaymentChan
 	types.Transport
 }
@@ -60,9 +60,9 @@ func NewNode(addr *netip.AddrPort, idPub *pub.Key, idPrv *prv.Key,
 	if !local {
 		// These ring buffers are needed to evaluate these metrics for remote
 		// peers only.
-		n.Load = ring.NewBufferLoad(DefaultSampleBufferSize)
-		n.Latency = ring.NewBufferLatency(DefaultSampleBufferSize)
-		n.Failure = ring.NewBufferFailure(DefaultSampleBufferSize)
+		n.Load = ring2.NewBufferLoad(DefaultSampleBufferSize)
+		n.Latency = ring2.NewBufferLatency(DefaultSampleBufferSize)
+		n.Failure = ring2.NewBufferFailure(DefaultSampleBufferSize)
 	}
 	return
 }
--- a/pkg/relay/packet/packet.go
+++ b/pkg/relay/packet/packet.go
--- a/pkg/relay/packet/packet_test.go
+++ b/pkg/relay/packet/packet_test.go
--- a/pkg/relay/packet/segcalc.go
+++ b/pkg/relay/packet/segcalc.go
--- a/pkg/relay/packet/segcalc_test.go
+++ b/pkg/relay/packet/segcalc_test.go
--- a/pkg/relay/packet/segment.go
+++ b/pkg/relay/packet/segment.go
@@ -4,10 +4,11 @@ import (
 	"errors"
 	"fmt"
 	"sort"
-
+	
+	"github.com/templexxx/reedsolomon"
+	
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
-	"github.com/templexxx/reedsolomon"
 )

 const ErrEmptyBytes = "cannot encode empty bytes"
@@ -85,7 +86,7 @@ func Join(packets Packets) (msg []byte, e error) {
 			// if they match.
 			if sha256.Single(ps.Data) ==
 				sha256.Single(packets[prevSeq].Data) {
-
+				
 				discard = append(discard, int(ps.Seq))
 				// No need to go on, we will discard this one.
 				continue
--- a/pkg/relay/packet/segment_test.go
+++ b/pkg/relay/packet/segment_test.go
--- a/pkg/relay/payments.go
+++ b/pkg/relay/payments.go
@@ -5,7 +5,7 @@ import (
 	
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/session"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/session"
 )

 type Payment struct {
--- a/pkg/relay/peel.go
+++ b/pkg/relay/peel.go
@@ -2,25 +2,25 @@ package relay

 import (
 	"fmt"
-
+	
 	"github.com/davecgh/go-spew/spew"
-
-	"git-indra.lan/indra-labs/indra/pkg/messages/balance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/confirm"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/delay"
-	"git-indra.lan/indra-labs/indra/pkg/messages/dxresponse"
-	"git-indra.lan/indra-labs/indra/pkg/messages/exit"
-	"git-indra.lan/indra-labs/indra/pkg/messages/forward"
-	"git-indra.lan/indra-labs/indra/pkg/messages/getbalance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice"
-	"git-indra.lan/indra-labs/indra/pkg/messages/intro"
-	"git-indra.lan/indra-labs/indra/pkg/messages/introquery"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
-	"git-indra.lan/indra-labs/indra/pkg/messages/response"
-	"git-indra.lan/indra-labs/indra/pkg/messages/reverse"
-	"git-indra.lan/indra-labs/indra/pkg/messages/session"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/balance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/delay"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/dxresponse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/exit"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/forward"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/intro"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/response"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/session"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/ring/failure.go
+++ b/pkg/relay/ring/failure.go
--- a/pkg/relay/ring/latency.go
+++ b/pkg/relay/ring/latency.go
--- a/pkg/relay/ring/load.go
+++ b/pkg/relay/ring/load.go
--- a/pkg/relay/send.go
+++ b/pkg/relay/send.go
@@ -5,14 +5,14 @@ import (
 	"runtime"
 	
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/balance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/confirm"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/exit"
-	"git-indra.lan/indra-labs/indra/pkg/messages/forward"
-	"git-indra.lan/indra-labs/indra/pkg/messages/getbalance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice"
-	"git-indra.lan/indra-labs/indra/pkg/messages/reverse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/balance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/exit"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/forward"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/services.go
+++ b/pkg/relay/services.go
@@ -1,6 +1,8 @@
 package relay

-import "git-indra.lan/indra-labs/indra/pkg/types"
+import (
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
+)

 type Service struct {
 	Port      uint16
--- a/pkg/relay/session.go
+++ b/pkg/relay/session.go
@@ -11,8 +11,8 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/signer"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/session"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/session"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/cryptorand"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )
--- a/pkg/relay/skins.go
+++ b/pkg/relay/skins.go
@@ -9,21 +9,21 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/prv"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/messages/balance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/confirm"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/messages/delay"
-	"git-indra.lan/indra-labs/indra/pkg/messages/exit"
-	"git-indra.lan/indra-labs/indra/pkg/messages/forward"
-	"git-indra.lan/indra-labs/indra/pkg/messages/getbalance"
-	"git-indra.lan/indra-labs/indra/pkg/messages/hiddenservice"
-	"git-indra.lan/indra-labs/indra/pkg/messages/intro"
-	"git-indra.lan/indra-labs/indra/pkg/messages/introquery"
-	"git-indra.lan/indra-labs/indra/pkg/messages/noop"
-	"git-indra.lan/indra-labs/indra/pkg/messages/response"
-	"git-indra.lan/indra-labs/indra/pkg/messages/reverse"
-	"git-indra.lan/indra-labs/indra/pkg/messages/session"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/balance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/confirm"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/delay"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/exit"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/forward"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/getbalance"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/hiddenservice"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/intro"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/introquery"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/noop"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/response"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/reverse"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/session"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/transport/sim.go
+++ b/pkg/relay/transport/sim.go
--- a/pkg/relay/transport/sim_test.go
+++ b/pkg/relay/transport/sim_test.go
--- a/pkg/relay/transport/transport.go
+++ b/pkg/relay/transport/transport.go
--- a/pkg/relay/transport/transport_test.go
+++ b/pkg/relay/transport/transport_test.go
--- a/pkg/relay/types/types.go
+++ b/pkg/relay/types/types.go
--- a/pkg/relay/util.go
+++ b/pkg/relay/util.go
@@ -10,8 +10,8 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/crypt"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/crypt"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

--- a/pkg/relay/utils_test.go
+++ b/pkg/relay/utils_test.go
@@ -4,8 +4,8 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/prv"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/pub"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
-	"git-indra.lan/indra-labs/indra/pkg/transport"
-	"git-indra.lan/indra-labs/indra/pkg/types"
+	"git-indra.lan/indra-labs/indra/pkg/relay/transport"
+	"git-indra.lan/indra-labs/indra/pkg/relay/types"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )

@@ -75,7 +75,8 @@ func CreateNMockCircuits(nCirc int, nReturns int) (cl []*Engine, e error) {
 	return createNMockCircuits(false, nCirc, nReturns)
 }

-func CreateNMockCircuitsWithSessions(nCirc int, nReturns int) (cl []*Engine, e error) {
-	return createNMockCircuits(true, nCirc, nReturns)
+func CreateNMockCircuitsWithSessions(nCirc int, nReturns int) (cl []*Engine,
+	e error) {
 	
+	return createNMockCircuits(true, nCirc, nReturns)
 }
--- a/pkg/util/splice/splice.go
+++ b/pkg/util/splice/splice.go
@@ -14,8 +14,8 @@ import (
 	"git-indra.lan/indra-labs/indra/pkg/crypto/key/sig"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/nonce"
 	"git-indra.lan/indra-labs/indra/pkg/crypto/sha256"
-	"git-indra.lan/indra-labs/indra/pkg/messages/magicbytes"
 	log2 "git-indra.lan/indra-labs/indra/pkg/proc/log"
+	"git-indra.lan/indra-labs/indra/pkg/relay/messages/magicbytes"
 	"git-indra.lan/indra-labs/indra/pkg/util/slice"
 )