@@ -12,13 +12,6 @@ import (

 	units "github.com/docker/go-units"

 )

-// EventsOptions holds parameters to filter events with.

-type EventsOptions struct {

-	Since   string

-	Until   string

-	Filters filters.Args

-}

-

 // NewHijackedResponse intializes a HijackedResponse type

 func NewHijackedResponse(conn net.Conn, mediaType string) HijackedResponse {

 	return HijackedResponse{Conn: conn, Reader: bufio.NewReader(conn), mediaType: mediaType}

@@ -1,4 +1,5 @@

 package events // import "github.com/docker/docker/api/types/events"

+import "github.com/docker/docker/api/types/filters"

 // Type is used for event-types.

 type Type string

@@ -125,3 +126,10 @@ type Message struct {

 	Time     int64 `json:"time,omitempty"`

 	TimeNano int64 `json:"timeNano,omitempty"`

 }

+

+// ListOptions holds parameters to filter events with.

+type ListOptions struct {

+	Since   string

+	Until   string

+	Filters filters.Args

+}

@@ -2,6 +2,7 @@ package types

 import (

 	"github.com/docker/docker/api/types/container"

+	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/image"

 	"github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/api/types/volume"

@@ -111,3 +112,8 @@ type CopyToContainerOptions = container.CopyToContainerOptions

 //

 // Deprecated: use [container.StatsResponse].

 type ContainerStats = container.StatsResponse

+

+// EventsOptions holds parameters to filter events with.

+//

+// Deprecated: use [events.ListOptions].

+type EventsOptions = events.ListOptions

@@ -6,7 +6,6 @@ import (

 	"net/url"

 	"time"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/filters"

 	timetypes "github.com/docker/docker/api/types/time"

@@ -16,7 +15,7 @@ import (

 // by cancelling the context. Once the stream has been completely read an io.EOF error will

 // be sent over the error channel. If an error is sent all processing will be stopped. It's up

 // to the caller to reopen the stream in the event of an error by reinvoking this method.

-func (cli *Client) Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error) {

+func (cli *Client) Events(ctx context.Context, options events.ListOptions) (<-chan events.Message, <-chan error) {

 	messages := make(chan events.Message)

 	errs := make(chan error, 1)

@@ -68,7 +67,7 @@ func (cli *Client) Events(ctx context.Context, options types.EventsOptions) (<-c

 	return messages, errs

 }

-func buildEventsQueryParams(cliVersion string, options types.EventsOptions) (url.Values, error) {

+func buildEventsQueryParams(cliVersion string, options events.ListOptions) (url.Values, error) {

 	query := url.Values{}

 	ref := time.Now()

@@ -10,7 +10,6 @@ import (

 	"strings"

 	"testing"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/errdefs"

@@ -20,17 +19,17 @@ import (

 func TestEventsErrorInOptions(t *testing.T) {

 	errorCases := []struct {

-		options       types.EventsOptions

+		options       events.ListOptions

 		expectedError string

 	}{

 		{

-			options: types.EventsOptions{

+			options: events.ListOptions{

 				Since: "2006-01-02TZ",

 			},

 			expectedError: `parsing time "2006-01-02TZ"`,

 		},

 		{

-			options: types.EventsOptions{

+			options: events.ListOptions{

 				Until: "2006-01-02TZ",

 			},

 			expectedError: `parsing time "2006-01-02TZ"`,

@@ -52,7 +51,7 @@ func TestEventsErrorFromServer(t *testing.T) {

 	client := &Client{

 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),

 	}

-	_, errs := client.Events(context.Background(), types.EventsOptions{})

+	_, errs := client.Events(context.Background(), events.ListOptions{})

 	err := <-errs

 	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))

 }

@@ -64,13 +63,13 @@ func TestEvents(t *testing.T) {

 	expectedFiltersJSON := fmt.Sprintf(`{"type":{"%s":true}}`, events.ContainerEventType)

 	eventsCases := []struct {

-		options             types.EventsOptions

+		options             events.ListOptions

 		events              []events.Message

 		expectedEvents      map[string]bool

 		expectedQueryParams map[string]string

 	}{

 		{

-			options: types.EventsOptions{

+			options: events.ListOptions{

 				Filters: fltrs,

 			},

 			expectedQueryParams: map[string]string{

@@ -80,7 +79,7 @@ func TestEvents(t *testing.T) {

 			expectedEvents: make(map[string]bool),

 		},

 		{

-			options: types.EventsOptions{

+			options: events.ListOptions{

 				Filters: fltrs,

 			},

 			expectedQueryParams: map[string]string{

@@ -165,7 +165,7 @@ type SwarmAPIClient interface {

 // SystemAPIClient defines API client methods for the system

 type SystemAPIClient interface {

-	Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error)

+	Events(ctx context.Context, options events.ListOptions) (<-chan events.Message, <-chan error)

 	Info(ctx context.Context) (system.Info, error)

 	RegistryLogin(ctx context.Context, auth registry.AuthConfig) (registry.AuthenticateOKBody, error)

 	DiskUsage(ctx context.Context, options types.DiskUsageOptions) (types.DiskUsage, error)

@@ -6,7 +6,6 @@ import (

 	"time"

 	cerrdefs "github.com/containerd/errdefs"

-	"github.com/docker/docker/api/types"

 	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/filters"

@@ -41,7 +40,7 @@ func TestPause(t *testing.T) {

 	until := request.DaemonUnixTime(ctx, t, apiClient, testEnv)

-	messages, errs := apiClient.Events(ctx, types.EventsOptions{

+	messages, errs := apiClient.Events(ctx, events.ListOptions{

 		Since:   since,

 		Until:   until,

 		Filters: filters.NewArgs(filters.Arg(string(events.ContainerEventType), cID)),

@@ -244,7 +244,7 @@ func TestContainerRestartWithCancelledRequest(t *testing.T) {

 	}()

 	// Start listening for events.

-	messages, errs := apiClient.Events(ctx, types.EventsOptions{

+	messages, errs := apiClient.Events(ctx, events.ListOptions{

 		Filters: filters.NewArgs(

 			filters.Arg("container", cID),

 			filters.Arg("event", string(events.ActionRestart)),

@@ -287,7 +287,7 @@ func systemTime(ctx context.Context, t *testing.T, client client.APIClient, test

 }

 func systemEventsSince(ctx context.Context, client client.APIClient, since string) (<-chan eventtypes.Message, <-chan error, func()) {

-	eventOptions := types.EventsOptions{

+	eventOptions := eventtypes.ListOptions{

 		Since: since,

 	}

 	ctx, cancel := context.WithCancel(ctx)

@@ -11,7 +11,6 @@ import (

 	"testing"

 	"time"

-	"github.com/docker/docker/api/types"

 	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/filters"

@@ -38,7 +37,7 @@ func TestEventsExecDie(t *testing.T) {

 	})

 	assert.NilError(t, err)

-	msg, errs := client.Events(ctx, types.EventsOptions{

+	msg, errs := client.Events(ctx, events.ListOptions{

 		Filters: filters.NewArgs(

 			filters.Arg("container", cID),

 			filters.Arg("event", string(events.ActionExecDie)),

@@ -156,7 +155,7 @@ func TestEventsVolumeCreate(t *testing.T) {

 		filters.Arg("event", "create"),

 		filters.Arg("volume", volName),

 	)

-	messages, errs := client.Events(ctx, types.EventsOptions{

+	messages, errs := client.Events(ctx, events.ListOptions{

 		Since:   since,

 		Until:   request.DaemonUnixTime(ctx, t, client, testEnv),

 		Filters: filter,

@@ -172,7 +171,7 @@ func TestEventsVolumeCreate(t *testing.T) {

 		Target: "/tmp/foo",

 	}))

-	messages, errs = client.Events(ctx, types.EventsOptions{

+	messages, errs = client.Events(ctx, events.ListOptions{

 		Since:   since,

 		Until:   request.DaemonUnixTime(ctx, t, client, testEnv),

 		Filters: filter,