Refactor collider API

downflux · Jan 5, 2023 · b7df325 · b7df325
1 parent 6046e95
commit b7df325
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/collider/collider.go b/collider/collider.go
@@ -25,7 +25,6 @@ var (
 )
 
 type O struct {
-	DB       *database.DB
 	PoolSize int
 }
 
@@ -34,12 +33,12 @@ type C struct {
 	poolSize int
 }
 
-func New(o O) *C {
+func New(db *database.DB, o O) *C {
 	if o.PoolSize < 2 {
 		panic(fmt.Sprintf("PoolSize specified %v is smaller than the minimum value of 2", o.PoolSize))
 	}
 	return &C{
-		db:       o.DB,
+		db:       db,
 		poolSize: o.PoolSize,
 	}
 }

diff --git a/collider/collider_test.go b/collider/collider_test.go
@@ -41,7 +41,7 @@ func TestTick(t *testing.T) {
 	configs := []config{
 		func() config {
 			db := database.New(database.DefaultO)
-			collider := New(O{DB: db, PoolSize: DefaultO.PoolSize})
+			collider := New(db, O{PoolSize: DefaultO.PoolSize})
 			a := db.InsertAgent(agent.O{
 				Position:       vector.V{0, 0},
 				TargetVelocity: vector.V{1, 1},
@@ -98,7 +98,7 @@ func TestTick(t *testing.T) {
 		}(),
 		func() config {
 			db := database.New(database.DefaultO)
-			collider := New(O{DB: db, PoolSize: DefaultO.PoolSize})
+			collider := New(db, DefaultO)
 			a := db.InsertAgent(agent.O{
 				Position:       vector.V{10, 10},
 				TargetVelocity: vector.V{1, 1},
@@ -120,7 +120,7 @@ func TestTick(t *testing.T) {
 		}(),
 		func() config {
 			db := database.New(database.DefaultO)
-			collider := New(O{DB: db, PoolSize: DefaultO.PoolSize})
+			collider := New(db, DefaultO)
 			a := db.InsertAgent(agent.O{
 				Position:       vector.V{10, 10},
 				TargetVelocity: vector.V{0, 1},
@@ -152,7 +152,7 @@ func TestTick(t *testing.T) {
 		}(),
 		func() config {
 			db := database.New(database.DefaultO)
-			collider := New(O{DB: db, PoolSize: DefaultO.PoolSize})
+			collider := New(db, DefaultO)
 			a := db.InsertAgent(agent.O{
 				Position:       vector.V{10, 10},
 				TargetVelocity: vector.V{0, 1},
@@ -182,7 +182,7 @@ func TestTick(t *testing.T) {
 		}(),
 		func() config {
 			db := database.New(database.DefaultO)
-			collider := New(O{DB: db, PoolSize: DefaultO.PoolSize})
+			collider := New(db, DefaultO)
 			a := db.InsertAgent(agent.O{
 				Position:           vector.V{60.0040783686527, 80.40391843262739},
 				TargetVelocity:     vector.V{10, 10},
@@ -256,7 +256,7 @@ func BenchmarkTick(b *testing.B) {
 			max := math.Sqrt(area)
 
 			db := database.New(database.DefaultO)
-			collider := New(O{DB: db, PoolSize: DefaultO.PoolSize})
+			collider := New(db, DefaultO)
 			for i := 0; i < c.n; i++ {
 				db.InsertAgent(agent.O{
 					Radius:             R,