diff --git a/README.md b/README.md index 45d12fb..ad96f3b 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ ```bash # Run a server -go run numenor-labs.us/dsfx/cmd/dsfx@main +go run numenor-labs.us/dsfx/dsfx/cmd/dsfx@main # serving: dsfx://0.0.0.0:8000# # Get the client -go run numenor-labs.us/dsfx/cmd/dsfxctl@main test dsfx://0.0.0.0:8000# +go run numenor-labs.us/dsfx/dsfx/cmd/dsfxctl@main test dsfx://0.0.0.0:8000# ``` diff --git a/cmd/dsfx/main.go b/cmd/dsfx/main.go index 7411162..ae8808c 100644 --- a/cmd/dsfx/main.go +++ b/cmd/dsfx/main.go @@ -3,9 +3,9 @@ package main import ( "context" - "numenor-labs.us/dsfx/internal/lib/disk" - "numenor-labs.us/dsfx/internal/lib/system" - "numenor-labs.us/dsfx/internal/peer" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/dsfx/internal/peer" ) func main() { diff --git a/cmd/dsfxctl/main.go b/cmd/dsfxctl/main.go index 1976552..6af181a 100644 --- a/cmd/dsfxctl/main.go +++ b/cmd/dsfxctl/main.go @@ -3,9 +3,9 @@ package main import ( "context" - "numenor-labs.us/dsfx/internal/client" - "numenor-labs.us/dsfx/internal/lib/disk" - "numenor-labs.us/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/dsfx/internal/client" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/system" ) func main() { diff --git a/docs/operating/deploying.md b/docs/operating/deploying.md index ba8bc56..bd74bd5 100644 --- a/docs/operating/deploying.md +++ b/docs/operating/deploying.md @@ -8,7 +8,7 @@ server on your deployment machine. If you opted to _not_ install dsfx locally, then you can run it directly with the go toolchain. ```bash -go run numenor-labs.us/dsfx/cmd/dsfx@main +go run numenor-labs.us/dsfx/dsfx/cmd/dsfx@main ``` Otherwise, you can run the server with the `dsfx` command. For those who built diff --git a/docs/operating/installing.md b/docs/operating/installing.md index 0158333..f18f852 100644 --- a/docs/operating/installing.md +++ b/docs/operating/installing.md @@ -44,7 +44,7 @@ Now that you have the go toolchain set up with access to our repository, you can project by using the `go install` command. ```bash -go install numenor-labs.us/dsfx/cmd/dsfx@main +go install numenor-labs.us/dsfx/dsfx/cmd/dsfx@main ``` Assuming that you have the `GOPATH` environment variable set up correctly, you will now be able to diff --git a/go.mod b/go.mod index 300068b..3651c37 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module numenor-labs.us/dsfx +module numenor-labs.us/dsfx/dsfx go 1.24.1 diff --git a/internal/client/client.go b/internal/client/client.go index e7d3b47..c6357aa 100644 --- a/internal/client/client.go +++ b/internal/client/client.go @@ -13,12 +13,12 @@ import ( "net" "os" - "numenor-labs.us/dsfx/internal/lib/crypto/identity" - "numenor-labs.us/dsfx/internal/lib/disk" - "numenor-labs.us/dsfx/internal/lib/logging" - "numenor-labs.us/dsfx/internal/lib/network" - "numenor-labs.us/dsfx/internal/lib/storage/scoped" - "numenor-labs.us/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/dsfx/internal/lib/network" + "numenor-labs.us/dsfx/dsfx/internal/lib/storage/scoped" + "numenor-labs.us/dsfx/dsfx/internal/lib/system" ) const ( diff --git a/internal/lib/crypto/encryption/aead_test.go b/internal/lib/crypto/encryption/aead_test.go index b134a96..7ed12b8 100644 --- a/internal/lib/crypto/encryption/aead_test.go +++ b/internal/lib/crypto/encryption/aead_test.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "testing" - "numenor-labs.us/dsfx/internal/lib/crypto/encryption" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/encryption" ) func TestEncryptDecrypt(t *testing.T) { diff --git a/internal/lib/disk/default_test.go b/internal/lib/disk/default_test.go index c3f61a4..1c6571c 100644 --- a/internal/lib/disk/default_test.go +++ b/internal/lib/disk/default_test.go @@ -3,7 +3,7 @@ package disk_test import ( "testing" - "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" ) func TestDefaultDisk(t *testing.T) { diff --git a/internal/lib/frame/frame_test.go b/internal/lib/frame/frame_test.go index a091dab..4eb4634 100644 --- a/internal/lib/frame/frame_test.go +++ b/internal/lib/frame/frame_test.go @@ -5,7 +5,7 @@ import ( "bytes" "testing" - "numenor-labs.us/dsfx/internal/lib/frame" + "numenor-labs.us/dsfx/dsfx/internal/lib/frame" ) func TestLenPrefixedWriteTo(t *testing.T) { diff --git a/internal/lib/handshake/handshake.go b/internal/lib/handshake/handshake.go index e54311e..75f9c48 100644 --- a/internal/lib/handshake/handshake.go +++ b/internal/lib/handshake/handshake.go @@ -10,12 +10,12 @@ import ( "io" "log/slog" - "numenor-labs.us/dsfx/internal/lib/assert" - "numenor-labs.us/dsfx/internal/lib/buffer" - "numenor-labs.us/dsfx/internal/lib/crypto/encryption" - "numenor-labs.us/dsfx/internal/lib/crypto/identity" - "numenor-labs.us/dsfx/internal/lib/crypto/keyexchange" - "numenor-labs.us/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/dsfx/internal/lib/assert" + "numenor-labs.us/dsfx/dsfx/internal/lib/buffer" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/encryption" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/keyexchange" + "numenor-labs.us/dsfx/dsfx/internal/lib/logging" ) const ( diff --git a/internal/lib/handshake/handshake_test.go b/internal/lib/handshake/handshake_test.go index 80c3650..32d4b95 100644 --- a/internal/lib/handshake/handshake_test.go +++ b/internal/lib/handshake/handshake_test.go @@ -10,8 +10,8 @@ import ( "sync" "testing" - "numenor-labs.us/dsfx/internal/lib/crypto/identity" - "numenor-labs.us/dsfx/internal/lib/handshake" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/dsfx/internal/lib/handshake" ) func TestHandshake(t *testing.T) { diff --git a/internal/lib/network/addr.go b/internal/lib/network/addr.go index 118ec2b..29f80e0 100644 --- a/internal/lib/network/addr.go +++ b/internal/lib/network/addr.go @@ -8,7 +8,7 @@ import ( "net" "strings" - "numenor-labs.us/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/identity" ) var ( diff --git a/internal/lib/network/conn.go b/internal/lib/network/conn.go index 45f445d..100418f 100644 --- a/internal/lib/network/conn.go +++ b/internal/lib/network/conn.go @@ -5,8 +5,8 @@ import ( "net" "time" - "numenor-labs.us/dsfx/internal/lib/crypto/encryption" - "numenor-labs.us/dsfx/internal/lib/frame" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/encryption" + "numenor-labs.us/dsfx/dsfx/internal/lib/frame" ) // Conn is a wrapper around net.TCPConn that encrypts and decrypts data as it is diff --git a/internal/lib/network/listener.go b/internal/lib/network/listener.go index 6bbec6e..b54b70b 100644 --- a/internal/lib/network/listener.go +++ b/internal/lib/network/listener.go @@ -6,8 +6,8 @@ import ( "log/slog" "net" - "numenor-labs.us/dsfx/internal/lib/crypto/identity" - "numenor-labs.us/dsfx/internal/lib/handshake" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/dsfx/internal/lib/handshake" ) // Listener ... diff --git a/internal/lib/network/network.go b/internal/lib/network/network.go index 265e293..d29f1c0 100644 --- a/internal/lib/network/network.go +++ b/internal/lib/network/network.go @@ -5,8 +5,8 @@ import ( "crypto/ed25519" "net" - "numenor-labs.us/dsfx/internal/lib/handshake" - "numenor-labs.us/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/dsfx/internal/lib/handshake" + "numenor-labs.us/dsfx/dsfx/internal/lib/logging" ) // Dial ... diff --git a/internal/lib/storage/scoped/scoped.go b/internal/lib/storage/scoped/scoped.go index dffa415..ad1497b 100644 --- a/internal/lib/storage/scoped/scoped.go +++ b/internal/lib/storage/scoped/scoped.go @@ -4,7 +4,7 @@ import ( "io/fs" "path/filepath" - "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" ) // StorageScope is an interface that extends the disk.Disk interface by ensuring diff --git a/internal/lib/storage/scoped/scoped_test.go b/internal/lib/storage/scoped/scoped_test.go index 1ba8013..8d11f67 100644 --- a/internal/lib/storage/scoped/scoped_test.go +++ b/internal/lib/storage/scoped/scoped_test.go @@ -4,8 +4,8 @@ import ( "io/fs" "testing" - "numenor-labs.us/dsfx/internal/lib/disk" - "numenor-labs.us/dsfx/internal/lib/storage/scoped" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/storage/scoped" ) func TestScopedStorage_Scope(t *testing.T) { diff --git a/internal/lib/system/default.go b/internal/lib/system/default.go index 83326b1..d682180 100644 --- a/internal/lib/system/default.go +++ b/internal/lib/system/default.go @@ -3,7 +3,7 @@ package system import ( "os" - "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" ) // Default returns a default implementation of the System interface. diff --git a/internal/lib/system/system.go b/internal/lib/system/system.go index 5687803..5c912a6 100644 --- a/internal/lib/system/system.go +++ b/internal/lib/system/system.go @@ -1,7 +1,7 @@ package system import ( - "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" ) type System interface { diff --git a/internal/peer/peer.go b/internal/peer/peer.go index 9d86d10..4d879bd 100644 --- a/internal/peer/peer.go +++ b/internal/peer/peer.go @@ -13,12 +13,12 @@ import ( "os" "strings" - "numenor-labs.us/dsfx/internal/lib/crypto/identity" - "numenor-labs.us/dsfx/internal/lib/disk" - "numenor-labs.us/dsfx/internal/lib/logging" - "numenor-labs.us/dsfx/internal/lib/network" - "numenor-labs.us/dsfx/internal/lib/storage/scoped" - "numenor-labs.us/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/logging" + "numenor-labs.us/dsfx/dsfx/internal/lib/network" + "numenor-labs.us/dsfx/dsfx/internal/lib/storage/scoped" + "numenor-labs.us/dsfx/dsfx/internal/lib/system" ) const ( diff --git a/internal/sim/disk.go b/internal/sim/disk.go index 9afa157..929f262 100644 --- a/internal/sim/disk.go +++ b/internal/sim/disk.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "numenor-labs.us/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" ) // Tolerance defines simulation tolerance parameters. diff --git a/internal/sim/system.go b/internal/sim/system.go index 6184c56..ba3c861 100644 --- a/internal/sim/system.go +++ b/internal/sim/system.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "numenor-labs.us/dsfx/internal/lib/disk" - "numenor-labs.us/dsfx/internal/lib/system" + "numenor-labs.us/dsfx/dsfx/internal/lib/disk" + "numenor-labs.us/dsfx/dsfx/internal/lib/system" ) // SimSystem is a simulated implementation of system.System. diff --git a/internal/tool/genkey/main.go b/internal/tool/genkey/main.go index 377848e..0f2bc94 100644 --- a/internal/tool/genkey/main.go +++ b/internal/tool/genkey/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "numenor-labs.us/dsfx/internal/lib/crypto/identity" + "numenor-labs.us/dsfx/dsfx/internal/lib/crypto/identity" ) func main() {