Merge pull request #17 from MattSScott/package-simplify

simplify package structure
MattSScott · Sep 28, 2023 · fc65f71 · fc65f71
2 parents 373be98 + 3e5dda8
commit fc65f71
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 352 deletions.
diff --git a/pkg/main/BaseAgent/agentInterface.go → BaseAgent/agentInterface.go b/pkg/main/BaseAgent/agentInterface.go → BaseAgent/agentInterface.go
@@ -1,7 +1,7 @@
 package baseagent
 
 import (
-	message "github.com/MattSScott/basePlatformSOMAS/pkg/main/messaging"
+	message "github.com/MattSScott/basePlatformSOMAS/messaging"
 
 	"github.com/google/uuid"
 )

diff --git a/pkg/main/BaseAgent/baseAgent.go → BaseAgent/baseAgent.go b/pkg/main/BaseAgent/baseAgent.go → BaseAgent/baseAgent.go
@@ -1,7 +1,7 @@
 package baseagent
 
 import (
-	message "github.com/MattSScott/basePlatformSOMAS/pkg/main/messaging"
+	message "github.com/MattSScott/basePlatformSOMAS/messaging"
 	"github.com/google/uuid"
 )
 

diff --git a/pkg/main/BaseAgent/baseAgent_test.go → BaseAgent/baseAgent_test.go b/pkg/main/BaseAgent/baseAgent_test.go → BaseAgent/baseAgent_test.go
@@ -3,7 +3,7 @@ package baseagent_test
 import (
 	"testing"
 
-	baseagent "github.com/MattSScott/basePlatformSOMAS/pkg/main/BaseAgent"
+	baseagent "github.com/MattSScott/basePlatformSOMAS/BaseAgent"
 	"github.com/google/uuid"
 )
 

diff --git a/pkg/main/BaseServer/baseServer.go → BaseServer/baseServer.go b/pkg/main/BaseServer/baseServer.go → BaseServer/baseServer.go
@@ -3,7 +3,7 @@ package baseserver
 import (
 	"fmt"
 
-	baseagent "github.com/MattSScott/basePlatformSOMAS/pkg/main/BaseAgent"
+	baseagent "github.com/MattSScott/basePlatformSOMAS/BaseAgent"
 	"github.com/google/uuid"
 )
 

diff --git a/pkg/main/BaseServer/baseServer_test.go → BaseServer/baseServer_test.go b/pkg/main/BaseServer/baseServer_test.go → BaseServer/baseServer_test.go
@@ -3,9 +3,9 @@ package baseserver_test
 import (
 	"testing"
 
-	baseagent "github.com/MattSScott/basePlatformSOMAS/pkg/main/BaseAgent"
-	baseserver "github.com/MattSScott/basePlatformSOMAS/pkg/main/BaseServer"
-	"github.com/MattSScott/basePlatformSOMAS/pkg/main/messaging"
+	baseagent "github.com/MattSScott/basePlatformSOMAS/BaseAgent"
+	baseserver "github.com/MattSScott/basePlatformSOMAS/BaseServer"
+	"github.com/MattSScott/basePlatformSOMAS/messaging"
 )
 
 type ITestBaseAgent interface {

diff --git a/pkg/main/BaseServer/serverInterface.go → BaseServer/serverInterface.go b/pkg/main/BaseServer/serverInterface.go → BaseServer/serverInterface.go
@@ -1,7 +1,7 @@
 package baseserver
 
 import (
-	baseagent "github.com/MattSScott/basePlatformSOMAS/pkg/main/BaseAgent"
+	baseagent "github.com/MattSScott/basePlatformSOMAS/BaseAgent"
 	"github.com/google/uuid"
 )
 

diff --git a/main.go b/main.go
diff --git a/pkg/main/messaging/agentMessenger.go → messaging/agentMessenger.go b/pkg/main/messaging/agentMessenger.go → messaging/agentMessenger.go
diff --git a/pkg/main/messaging/message.go → messaging/message.go b/pkg/main/messaging/message.go → messaging/message.go
diff --git a/pkg/main/messaging/message_test.go → messaging/message_test.go b/pkg/main/messaging/message_test.go → messaging/message_test.go
@@ -3,8 +3,8 @@ package messaging_test
 import (
 	"testing"
 
-	baseagent "github.com/MattSScott/basePlatformSOMAS/pkg/main/BaseAgent"
-	"github.com/MattSScott/basePlatformSOMAS/pkg/main/messaging"
+	baseagent "github.com/MattSScott/basePlatformSOMAS/BaseAgent"
+	"github.com/MattSScott/basePlatformSOMAS/messaging"
 )
 
 type Message1 struct {

diff --git a/pkg/testing/testAgents/baseExtendedAgent/baseExtendedAgent.go b/pkg/testing/testAgents/baseExtendedAgent/baseExtendedAgent.go
diff --git a/pkg/testing/testAgents/baseExtendedAgent/baseExtendedAgent_test.go b/pkg/testing/testAgents/baseExtendedAgent/baseExtendedAgent_test.go
diff --git a/pkg/testing/testAgents/baseExtendedAgent/greetingMessage.go b/pkg/testing/testAgents/baseExtendedAgent/greetingMessage.go
diff --git a/pkg/testing/testAgents/helloAgent/helloAgent.go b/pkg/testing/testAgents/helloAgent/helloAgent.go
diff --git a/pkg/testing/testAgents/worldAgent/worldAgent.go b/pkg/testing/testAgents/worldAgent/worldAgent.go
diff --git a/pkg/testing/testServer/server_test.go b/pkg/testing/testServer/server_test.go