Merge pull request etcd-io#16448 from testwill/pkg-import

chore: pkg import more than once
ahrtr · Aug 21, 2023 · e2e17c7 · e2e17c7
2 parents 9a6eab2 + f432c1c
commit e2e17c7
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/server/etcdserver/api/membership/membership_test.go b/server/etcdserver/api/membership/membership_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"go.etcd.io/etcd/client/pkg/v3/types"
-	"go.etcd.io/etcd/server/v3/etcdserver/version"
 	serverversion "go.etcd.io/etcd/server/v3/etcdserver/version"
 
 	"go.uber.org/zap"
@@ -57,7 +56,7 @@ type backendMock struct {
 	members       map[types.ID]*Member
 	removed       map[types.ID]bool
 	version       *semver.Version
-	downgradeInfo *version.DowngradeInfo
+	downgradeInfo *serverversion.DowngradeInfo
 }
 
 var _ MembershipBackend = (*backendMock)(nil)
@@ -93,7 +92,7 @@ func (b *backendMock) MustDeleteMemberFromBackend(id types.ID) {
 	b.removed[id] = true
 }
 
-func (b *backendMock) MustSaveDowngradeToBackend(downgradeInfo *version.DowngradeInfo) {
+func (b *backendMock) MustSaveDowngradeToBackend(downgradeInfo *serverversion.DowngradeInfo) {
 	b.downgradeInfo = downgradeInfo
 }
-func (b *backendMock) DowngradeInfoFromBackend() *version.DowngradeInfo { return b.downgradeInfo }
+func (b *backendMock) DowngradeInfoFromBackend() *serverversion.DowngradeInfo { return b.downgradeInfo }