regerate mocks with mockery v3.8.0

foodgroup/mock_account_manager_test.go

@@ -18,10 +18,19 @@ func newMockAccountManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAccountManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAccountManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockAccountManager_ConfirmStatus_Call struct {
 // ConfirmStatus is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) ConfirmStatus(ctx interface{}, screenName interface{}) *mockAccountManager_ConfirmStatus_Call {
+func (_e *mockAccountManager_Expecter) ConfirmStatus(ctx any, screenName any) *mockAccountManager_ConfirmStatus_Call {
 	return &mockAccountManager_ConfirmStatus_Call{Call: _e.mock.On("ConfirmStatus", ctx, screenName)}
 }
 
@@ -141,7 +150,7 @@ type mockAccountManager_EmailAddress_Call struct {
 // EmailAddress is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) EmailAddress(ctx interface{}, screenName interface{}) *mockAccountManager_EmailAddress_Call {
+func (_e *mockAccountManager_Expecter) EmailAddress(ctx any, screenName any) *mockAccountManager_EmailAddress_Call {
 	return &mockAccountManager_EmailAddress_Call{Call: _e.mock.On("EmailAddress", ctx, screenName)}
 }
 
@@ -207,7 +216,7 @@ type mockAccountManager_RegStatus_Call struct {
 // RegStatus is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) RegStatus(ctx interface{}, screenName interface{}) *mockAccountManager_RegStatus_Call {
+func (_e *mockAccountManager_Expecter) RegStatus(ctx any, screenName any) *mockAccountManager_RegStatus_Call {
 	return &mockAccountManager_RegStatus_Call{Call: _e.mock.On("RegStatus", ctx, screenName)}
 }
 
@@ -265,7 +274,7 @@ type mockAccountManager_SetUserPassword_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - newPassword string
-func (_e *mockAccountManager_Expecter) SetUserPassword(ctx interface{}, screenName interface{}, newPassword interface{}) *mockAccountManager_SetUserPassword_Call {
+func (_e *mockAccountManager_Expecter) SetUserPassword(ctx any, screenName any, newPassword any) *mockAccountManager_SetUserPassword_Call {
 	return &mockAccountManager_SetUserPassword_Call{Call: _e.mock.On("SetUserPassword", ctx, screenName, newPassword)}
 }
 
@@ -328,7 +337,7 @@ type mockAccountManager_UpdateConfirmStatus_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - confirmStatus bool
-func (_e *mockAccountManager_Expecter) UpdateConfirmStatus(ctx interface{}, screenName interface{}, confirmStatus interface{}) *mockAccountManager_UpdateConfirmStatus_Call {
+func (_e *mockAccountManager_Expecter) UpdateConfirmStatus(ctx any, screenName any, confirmStatus any) *mockAccountManager_UpdateConfirmStatus_Call {
 	return &mockAccountManager_UpdateConfirmStatus_Call{Call: _e.mock.On("UpdateConfirmStatus", ctx, screenName, confirmStatus)}
 }
 
@@ -390,7 +399,7 @@ type mockAccountManager_UpdateDisplayScreenName_Call struct {
 // UpdateDisplayScreenName is a helper method to define mock.On call
 //   - ctx context.Context
 //   - displayScreenName state.DisplayScreenName
-func (_e *mockAccountManager_Expecter) UpdateDisplayScreenName(ctx interface{}, displayScreenName interface{}) *mockAccountManager_UpdateDisplayScreenName_Call {
+func (_e *mockAccountManager_Expecter) UpdateDisplayScreenName(ctx any, displayScreenName any) *mockAccountManager_UpdateDisplayScreenName_Call {
 	return &mockAccountManager_UpdateDisplayScreenName_Call{Call: _e.mock.On("UpdateDisplayScreenName", ctx, displayScreenName)}
 }
 
@@ -448,7 +457,7 @@ type mockAccountManager_UpdateEmailAddress_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - emailAddress *mail.Address
-func (_e *mockAccountManager_Expecter) UpdateEmailAddress(ctx interface{}, screenName interface{}, emailAddress interface{}) *mockAccountManager_UpdateEmailAddress_Call {
+func (_e *mockAccountManager_Expecter) UpdateEmailAddress(ctx any, screenName any, emailAddress any) *mockAccountManager_UpdateEmailAddress_Call {
 	return &mockAccountManager_UpdateEmailAddress_Call{Call: _e.mock.On("UpdateEmailAddress", ctx, screenName, emailAddress)}
 }
 
@@ -511,7 +520,7 @@ type mockAccountManager_UpdateRegStatus_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - regStatus uint16
-func (_e *mockAccountManager_Expecter) UpdateRegStatus(ctx interface{}, screenName interface{}, regStatus interface{}) *mockAccountManager_UpdateRegStatus_Call {
+func (_e *mockAccountManager_Expecter) UpdateRegStatus(ctx any, screenName any, regStatus any) *mockAccountManager_UpdateRegStatus_Call {
 	return &mockAccountManager_UpdateRegStatus_Call{Call: _e.mock.On("UpdateRegStatus", ctx, screenName, regStatus)}
 }
 
@@ -584,7 +593,7 @@ type mockAccountManager_User_Call struct {
 // User is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) User(ctx interface{}, screenName interface{}) *mockAccountManager_User_Call {
+func (_e *mockAccountManager_Expecter) User(ctx any, screenName any) *mockAccountManager_User_Call {
 	return &mockAccountManager_User_Call{Call: _e.mock.On("User", ctx, screenName)}
 }
 

foodgroup/mock_bart_item_manager_test.go

@@ -18,10 +18,19 @@ func newMockBARTItemManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBARTItemManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBARTItemManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockBARTItemManager_BARTItem_Call struct {
 // BARTItem is a helper method to define mock.On call
 //   - ctx context.Context
 //   - hash []byte
-func (_e *mockBARTItemManager_Expecter) BARTItem(ctx interface{}, hash interface{}) *mockBARTItemManager_BARTItem_Call {
+func (_e *mockBARTItemManager_Expecter) BARTItem(ctx any, hash any) *mockBARTItemManager_BARTItem_Call {
 	return &mockBARTItemManager_BARTItem_Call{Call: _e.mock.On("BARTItem", ctx, hash)}
 }
 
@@ -143,7 +152,7 @@ type mockBARTItemManager_BuddyIconMetadata_Call struct {
 // BuddyIconMetadata is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockBARTItemManager_Expecter) BuddyIconMetadata(ctx interface{}, screenName interface{}) *mockBARTItemManager_BuddyIconMetadata_Call {
+func (_e *mockBARTItemManager_Expecter) BuddyIconMetadata(ctx any, screenName any) *mockBARTItemManager_BuddyIconMetadata_Call {
 	return &mockBARTItemManager_BuddyIconMetadata_Call{Call: _e.mock.On("BuddyIconMetadata", ctx, screenName)}
 }
 
@@ -200,7 +209,7 @@ type mockBARTItemManager_DeleteBARTItem_Call struct {
 // DeleteBARTItem is a helper method to define mock.On call
 //   - ctx context.Context
 //   - hash []byte
-func (_e *mockBARTItemManager_Expecter) DeleteBARTItem(ctx interface{}, hash interface{}) *mockBARTItemManager_DeleteBARTItem_Call {
+func (_e *mockBARTItemManager_Expecter) DeleteBARTItem(ctx any, hash any) *mockBARTItemManager_DeleteBARTItem_Call {
 	return &mockBARTItemManager_DeleteBARTItem_Call{Call: _e.mock.On("DeleteBARTItem", ctx, hash)}
 }
 
@@ -259,7 +268,7 @@ type mockBARTItemManager_InsertBARTItem_Call struct {
 //   - hash []byte
 //   - blob []byte
 //   - itemType uint16
-func (_e *mockBARTItemManager_Expecter) InsertBARTItem(ctx interface{}, hash interface{}, blob interface{}, itemType interface{}) *mockBARTItemManager_InsertBARTItem_Call {
+func (_e *mockBARTItemManager_Expecter) InsertBARTItem(ctx any, hash any, blob any, itemType any) *mockBARTItemManager_InsertBARTItem_Call {
 	return &mockBARTItemManager_InsertBARTItem_Call{Call: _e.mock.On("InsertBARTItem", ctx, hash, blob, itemType)}
 }
 
@@ -337,7 +346,7 @@ type mockBARTItemManager_ListBARTItems_Call struct {
 // ListBARTItems is a helper method to define mock.On call
 //   - ctx context.Context
 //   - itemType uint16
-func (_e *mockBARTItemManager_Expecter) ListBARTItems(ctx interface{}, itemType interface{}) *mockBARTItemManager_ListBARTItems_Call {
+func (_e *mockBARTItemManager_Expecter) ListBARTItems(ctx any, itemType any) *mockBARTItemManager_ListBARTItems_Call {
 	return &mockBARTItemManager_ListBARTItems_Call{Call: _e.mock.On("ListBARTItems", ctx, itemType)}
 }
 

foodgroup/mock_buddy_added_notifier_deduper_test.go

@@ -17,10 +17,19 @@ func newMockBuddyAddedNotifierDeduper(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyAddedNotifierDeduper {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyAddedNotifierDeduper{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockBuddyAddedNotifierDeduper_HasBuddyAddedNotification_Call struct {
 //   - ctx context.Context
 //   - granter state.IdentScreenName
 //   - requester state.IdentScreenName
-func (_e *mockBuddyAddedNotifierDeduper_Expecter) HasBuddyAddedNotification(ctx interface{}, granter interface{}, requester interface{}) *mockBuddyAddedNotifierDeduper_HasBuddyAddedNotification_Call {
+func (_e *mockBuddyAddedNotifierDeduper_Expecter) HasBuddyAddedNotification(ctx any, granter any, requester any) *mockBuddyAddedNotifierDeduper_HasBuddyAddedNotification_Call {
 	return &mockBuddyAddedNotifierDeduper_HasBuddyAddedNotification_Call{Call: _e.mock.On("HasBuddyAddedNotification", ctx, granter, requester)}
 }
 
@@ -136,7 +145,7 @@ type mockBuddyAddedNotifierDeduper_RecordBuddyAddedNotification_Call struct {
 //   - ctx context.Context
 //   - granter state.IdentScreenName
 //   - requester state.IdentScreenName
-func (_e *mockBuddyAddedNotifierDeduper_Expecter) RecordBuddyAddedNotification(ctx interface{}, granter interface{}, requester interface{}) *mockBuddyAddedNotifierDeduper_RecordBuddyAddedNotification_Call {
+func (_e *mockBuddyAddedNotifierDeduper_Expecter) RecordBuddyAddedNotification(ctx any, granter any, requester any) *mockBuddyAddedNotifierDeduper_RecordBuddyAddedNotification_Call {
 	return &mockBuddyAddedNotifierDeduper_RecordBuddyAddedNotification_Call{Call: _e.mock.On("RecordBuddyAddedNotification", ctx, granter, requester)}
 }
 

foodgroup/mock_buddy_broadcaster_test.go

@@ -18,10 +18,19 @@ func newMockbuddyBroadcaster(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockbuddyBroadcaster {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockbuddyBroadcaster{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockbuddyBroadcaster_BroadcastBuddyArrived_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - userInfo wire.TLVUserInfo
-func (_e *mockbuddyBroadcaster_Expecter) BroadcastBuddyArrived(ctx interface{}, screenName interface{}, userInfo interface{}) *mockbuddyBroadcaster_BroadcastBuddyArrived_Call {
+func (_e *mockbuddyBroadcaster_Expecter) BroadcastBuddyArrived(ctx any, screenName any, userInfo any) *mockbuddyBroadcaster_BroadcastBuddyArrived_Call {
 	return &mockbuddyBroadcaster_BroadcastBuddyArrived_Call{Call: _e.mock.On("BroadcastBuddyArrived", ctx, screenName, userInfo)}
 }
 
@@ -127,7 +136,7 @@ type mockbuddyBroadcaster_BroadcastBuddyDeparted_Call struct {
 // BroadcastBuddyDeparted is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockbuddyBroadcaster_Expecter) BroadcastBuddyDeparted(ctx interface{}, screenName interface{}) *mockbuddyBroadcaster_BroadcastBuddyDeparted_Call {
+func (_e *mockbuddyBroadcaster_Expecter) BroadcastBuddyDeparted(ctx any, screenName any) *mockbuddyBroadcaster_BroadcastBuddyDeparted_Call {
 	return &mockbuddyBroadcaster_BroadcastBuddyDeparted_Call{Call: _e.mock.On("BroadcastBuddyDeparted", ctx, screenName)}
 }
 
@@ -186,7 +195,7 @@ type mockbuddyBroadcaster_BroadcastVisibility_Call struct {
 //   - you *state.SessionInstance
 //   - filter []state.IdentScreenName
 //   - sendDepartures bool
-func (_e *mockbuddyBroadcaster_Expecter) BroadcastVisibility(ctx interface{}, you interface{}, filter interface{}, sendDepartures interface{}) *mockbuddyBroadcaster_BroadcastVisibility_Call {
+func (_e *mockbuddyBroadcaster_Expecter) BroadcastVisibility(ctx any, you any, filter any, sendDepartures any) *mockbuddyBroadcaster_BroadcastVisibility_Call {
 	return &mockbuddyBroadcaster_BroadcastVisibility_Call{Call: _e.mock.On("BroadcastVisibility", ctx, you, filter, sendDepartures)}
 }
 

foodgroup/mock_chat_message_relayer_test.go

@@ -18,10 +18,19 @@ func newMockChatMessageRelayer(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatMessageRelayer {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatMessageRelayer{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockChatMessageRelayer_AllSessions_Call struct {
 
 // AllSessions is a helper method to define mock.On call
 //   - chatCookie string
-func (_e *mockChatMessageRelayer_Expecter) AllSessions(chatCookie interface{}) *mockChatMessageRelayer_AllSessions_Call {
+func (_e *mockChatMessageRelayer_Expecter) AllSessions(chatCookie any) *mockChatMessageRelayer_AllSessions_Call {
 	return &mockChatMessageRelayer_AllSessions_Call{Call: _e.mock.On("AllSessions", chatCookie)}
 }
 
@@ -108,7 +117,7 @@ type mockChatMessageRelayer_RelayToAllExcept_Call struct {
 //   - chatCookie string
 //   - except state.IdentScreenName
 //   - msg wire.SNACMessage
-func (_e *mockChatMessageRelayer_Expecter) RelayToAllExcept(ctx interface{}, chatCookie interface{}, except interface{}, msg interface{}) *mockChatMessageRelayer_RelayToAllExcept_Call {
+func (_e *mockChatMessageRelayer_Expecter) RelayToAllExcept(ctx any, chatCookie any, except any, msg any) *mockChatMessageRelayer_RelayToAllExcept_Call {
 	return &mockChatMessageRelayer_RelayToAllExcept_Call{Call: _e.mock.On("RelayToAllExcept", ctx, chatCookie, except, msg)}
 }
 
@@ -166,7 +175,7 @@ type mockChatMessageRelayer_RelayToScreenName_Call struct {
 //   - chatCookie string
 //   - recipient state.IdentScreenName
 //   - msg wire.SNACMessage
-func (_e *mockChatMessageRelayer_Expecter) RelayToScreenName(ctx interface{}, chatCookie interface{}, recipient interface{}, msg interface{}) *mockChatMessageRelayer_RelayToScreenName_Call {
+func (_e *mockChatMessageRelayer_Expecter) RelayToScreenName(ctx any, chatCookie any, recipient any, msg any) *mockChatMessageRelayer_RelayToScreenName_Call {
 	return &mockChatMessageRelayer_RelayToScreenName_Call{Call: _e.mock.On("RelayToScreenName", ctx, chatCookie, recipient, msg)}
 }
 

foodgroup/mock_chat_room_registry_test.go

@@ -17,10 +17,19 @@ func newMockChatRoomRegistry(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatRoomRegistry {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatRoomRegistry{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -72,7 +81,7 @@ type mockChatRoomRegistry_ChatRoomByCookie_Call struct {
 // ChatRoomByCookie is a helper method to define mock.On call
 //   - ctx context.Context
 //   - chatCookie string
-func (_e *mockChatRoomRegistry_Expecter) ChatRoomByCookie(ctx interface{}, chatCookie interface{}) *mockChatRoomRegistry_ChatRoomByCookie_Call {
+func (_e *mockChatRoomRegistry_Expecter) ChatRoomByCookie(ctx any, chatCookie any) *mockChatRoomRegistry_ChatRoomByCookie_Call {
 	return &mockChatRoomRegistry_ChatRoomByCookie_Call{Call: _e.mock.On("ChatRoomByCookie", ctx, chatCookie)}
 }
 
@@ -139,7 +148,7 @@ type mockChatRoomRegistry_ChatRoomByName_Call struct {
 //   - ctx context.Context
 //   - exchange uint16
 //   - name string
-func (_e *mockChatRoomRegistry_Expecter) ChatRoomByName(ctx interface{}, exchange interface{}, name interface{}) *mockChatRoomRegistry_ChatRoomByName_Call {
+func (_e *mockChatRoomRegistry_Expecter) ChatRoomByName(ctx any, exchange any, name any) *mockChatRoomRegistry_ChatRoomByName_Call {
 	return &mockChatRoomRegistry_ChatRoomByName_Call{Call: _e.mock.On("ChatRoomByName", ctx, exchange, name)}
 }
 
@@ -201,7 +210,7 @@ type mockChatRoomRegistry_CreateChatRoom_Call struct {
 // CreateChatRoom is a helper method to define mock.On call
 //   - ctx context.Context
 //   - chatRoom *state.ChatRoom
-func (_e *mockChatRoomRegistry_Expecter) CreateChatRoom(ctx interface{}, chatRoom interface{}) *mockChatRoomRegistry_CreateChatRoom_Call {
+func (_e *mockChatRoomRegistry_Expecter) CreateChatRoom(ctx any, chatRoom any) *mockChatRoomRegistry_CreateChatRoom_Call {
 	return &mockChatRoomRegistry_CreateChatRoom_Call{Call: _e.mock.On("CreateChatRoom", ctx, chatRoom)}
 }
 

foodgroup/mock_chat_session_registry_test.go

@@ -17,10 +17,19 @@ func newMockChatSessionRegistry(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatSessionRegistry {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatSessionRegistry{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -41,11 +50,11 @@ func (_m *mockChatSessionRegistry) EXPECT() *mockChatSessionRegistry_Expecter {
 // AddSession provides a mock function for the type mockChatSessionRegistry
 func (_mock *mockChatSessionRegistry) AddSession(ctx context.Context, chatCookie string, screenName state.DisplayScreenName, cfg ...func(sess *state.Session)) (*state.SessionInstance, error) {
 	// func(sess *state.Session)
-	_va := make([]interface{}, len(cfg))
+	_va := make([]any, len(cfg))
 	for _i := range cfg {
 		_va[_i] = cfg[_i]
 	}
-	var _ca []interface{}
+	var _ca []any
 	_ca = append(_ca, ctx, chatCookie, screenName)
 	_ca = append(_ca, _va...)
 	ret := _mock.Called(_ca...)
@@ -84,9 +93,9 @@ type mockChatSessionRegistry_AddSession_Call struct {
 //   - chatCookie string
 //   - screenName state.DisplayScreenName
 //   - cfg ...func(sess *state.Session)
-func (_e *mockChatSessionRegistry_Expecter) AddSession(ctx interface{}, chatCookie interface{}, screenName interface{}, cfg ...interface{}) *mockChatSessionRegistry_AddSession_Call {
+func (_e *mockChatSessionRegistry_Expecter) AddSession(ctx any, chatCookie any, screenName any, cfg ...any) *mockChatSessionRegistry_AddSession_Call {
 	return &mockChatSessionRegistry_AddSession_Call{Call: _e.mock.On("AddSession",
-		append([]interface{}{ctx, chatCookie, screenName}, cfg...)...)}
+		append([]any{ctx, chatCookie, screenName}, cfg...)...)}
 }
 
 func (_c *mockChatSessionRegistry_AddSession_Call) Run(run func(ctx context.Context, chatCookie string, screenName state.DisplayScreenName, cfg ...func(sess *state.Session))) *mockChatSessionRegistry_AddSession_Call {
@@ -144,7 +153,7 @@ type mockChatSessionRegistry_RemoveSession_Call struct {
 
 // RemoveSession is a helper method to define mock.On call
 //   - sess *state.Session
-func (_e *mockChatSessionRegistry_Expecter) RemoveSession(sess interface{}) *mockChatSessionRegistry_RemoveSession_Call {
+func (_e *mockChatSessionRegistry_Expecter) RemoveSession(sess any) *mockChatSessionRegistry_RemoveSession_Call {
 	return &mockChatSessionRegistry_RemoveSession_Call{Call: _e.mock.On("RemoveSession", sess)}
 }
 

foodgroup/mock_client_side_buddy_list_manager_test.go

@@ -18,10 +18,19 @@ func newMockClientSideBuddyListManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockClientSideBuddyListManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockClientSideBuddyListManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockClientSideBuddyListManager_AddBuddy_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockClientSideBuddyListManager_Expecter) AddBuddy(ctx interface{}, me interface{}, them interface{}) *mockClientSideBuddyListManager_AddBuddy_Call {
+func (_e *mockClientSideBuddyListManager_Expecter) AddBuddy(ctx any, me any, them any) *mockClientSideBuddyListManager_AddBuddy_Call {
 	return &mockClientSideBuddyListManager_AddBuddy_Call{Call: _e.mock.On("AddBuddy", ctx, me, them)}
 }
 
@@ -128,7 +137,7 @@ type mockClientSideBuddyListManager_DenyBuddy_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockClientSideBuddyListManager_Expecter) DenyBuddy(ctx interface{}, me interface{}, them interface{}) *mockClientSideBuddyListManager_DenyBuddy_Call {
+func (_e *mockClientSideBuddyListManager_Expecter) DenyBuddy(ctx any, me any, them any) *mockClientSideBuddyListManager_DenyBuddy_Call {
 	return &mockClientSideBuddyListManager_DenyBuddy_Call{Call: _e.mock.On("DenyBuddy", ctx, me, them)}
 }
 
@@ -191,7 +200,7 @@ type mockClientSideBuddyListManager_PermitBuddy_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockClientSideBuddyListManager_Expecter) PermitBuddy(ctx interface{}, me interface{}, them interface{}) *mockClientSideBuddyListManager_PermitBuddy_Call {
+func (_e *mockClientSideBuddyListManager_Expecter) PermitBuddy(ctx any, me any, them any) *mockClientSideBuddyListManager_PermitBuddy_Call {
 	return &mockClientSideBuddyListManager_PermitBuddy_Call{Call: _e.mock.On("PermitBuddy", ctx, me, them)}
 }
 
@@ -254,7 +263,7 @@ type mockClientSideBuddyListManager_RemoveBuddy_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockClientSideBuddyListManager_Expecter) RemoveBuddy(ctx interface{}, me interface{}, them interface{}) *mockClientSideBuddyListManager_RemoveBuddy_Call {
+func (_e *mockClientSideBuddyListManager_Expecter) RemoveBuddy(ctx any, me any, them any) *mockClientSideBuddyListManager_RemoveBuddy_Call {
 	return &mockClientSideBuddyListManager_RemoveBuddy_Call{Call: _e.mock.On("RemoveBuddy", ctx, me, them)}
 }
 
@@ -317,7 +326,7 @@ type mockClientSideBuddyListManager_RemoveDenyBuddy_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockClientSideBuddyListManager_Expecter) RemoveDenyBuddy(ctx interface{}, me interface{}, them interface{}) *mockClientSideBuddyListManager_RemoveDenyBuddy_Call {
+func (_e *mockClientSideBuddyListManager_Expecter) RemoveDenyBuddy(ctx any, me any, them any) *mockClientSideBuddyListManager_RemoveDenyBuddy_Call {
 	return &mockClientSideBuddyListManager_RemoveDenyBuddy_Call{Call: _e.mock.On("RemoveDenyBuddy", ctx, me, them)}
 }
 
@@ -380,7 +389,7 @@ type mockClientSideBuddyListManager_RemovePermitBuddy_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockClientSideBuddyListManager_Expecter) RemovePermitBuddy(ctx interface{}, me interface{}, them interface{}) *mockClientSideBuddyListManager_RemovePermitBuddy_Call {
+func (_e *mockClientSideBuddyListManager_Expecter) RemovePermitBuddy(ctx any, me any, them any) *mockClientSideBuddyListManager_RemovePermitBuddy_Call {
 	return &mockClientSideBuddyListManager_RemovePermitBuddy_Call{Call: _e.mock.On("RemovePermitBuddy", ctx, me, them)}
 }
 
@@ -443,7 +452,7 @@ type mockClientSideBuddyListManager_SetPDMode_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - pdMode wire.FeedbagPDMode
-func (_e *mockClientSideBuddyListManager_Expecter) SetPDMode(ctx interface{}, me interface{}, pdMode interface{}) *mockClientSideBuddyListManager_SetPDMode_Call {
+func (_e *mockClientSideBuddyListManager_Expecter) SetPDMode(ctx any, me any, pdMode any) *mockClientSideBuddyListManager_SetPDMode_Call {
 	return &mockClientSideBuddyListManager_SetPDMode_Call{Call: _e.mock.On("SetPDMode", ctx, me, pdMode)}
 }
 

foodgroup/mock_contact_pre_authorizer_test.go

@@ -17,10 +17,19 @@ func newMockContactPreAuthorizer(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockContactPreAuthorizer {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockContactPreAuthorizer{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -64,7 +73,7 @@ type mockContactPreAuthorizer_RecordPreAuth_Call struct {
 //   - ctx context.Context
 //   - owner state.IdentScreenName
 //   - requester state.IdentScreenName
-func (_e *mockContactPreAuthorizer_Expecter) RecordPreAuth(ctx interface{}, owner interface{}, requester interface{}) *mockContactPreAuthorizer_RecordPreAuth_Call {
+func (_e *mockContactPreAuthorizer_Expecter) RecordPreAuth(ctx any, owner any, requester any) *mockContactPreAuthorizer_RecordPreAuth_Call {
 	return &mockContactPreAuthorizer_RecordPreAuth_Call{Call: _e.mock.On("RecordPreAuth", ctx, owner, requester)}
 }
 
@@ -136,7 +145,7 @@ type mockContactPreAuthorizer_RequiresAuthorization_Call struct {
 //   - ctx context.Context
 //   - owner state.IdentScreenName
 //   - requester state.IdentScreenName
-func (_e *mockContactPreAuthorizer_Expecter) RequiresAuthorization(ctx interface{}, owner interface{}, requester interface{}) *mockContactPreAuthorizer_RequiresAuthorization_Call {
+func (_e *mockContactPreAuthorizer_Expecter) RequiresAuthorization(ctx any, owner any, requester any) *mockContactPreAuthorizer_RequiresAuthorization_Call {
 	return &mockContactPreAuthorizer_RequiresAuthorization_Call{Call: _e.mock.On("RequiresAuthorization", ctx, owner, requester)}
 }
 

foodgroup/mock_cookie_baker_test.go

@@ -16,10 +16,19 @@ func newMockCookieBaker(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockCookieBaker {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockCookieBaker{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -78,7 +87,7 @@ type mockCookieBaker_Crack_Call struct {
 
 // Crack is a helper method to define mock.On call
 //   - data []byte
-func (_e *mockCookieBaker_Expecter) Crack(data interface{}) *mockCookieBaker_Crack_Call {
+func (_e *mockCookieBaker_Expecter) Crack(data any) *mockCookieBaker_Crack_Call {
 	return &mockCookieBaker_Crack_Call{Call: _e.mock.On("Crack", data)}
 }
 
@@ -141,7 +150,7 @@ type mockCookieBaker_Issue_Call struct {
 // Issue is a helper method to define mock.On call
 //   - data []byte
 //   - ttl time.Duration
-func (_e *mockCookieBaker_Expecter) Issue(data interface{}, ttl interface{}) *mockCookieBaker_Issue_Call {
+func (_e *mockCookieBaker_Expecter) Issue(data any, ttl any) *mockCookieBaker_Issue_Call {
 	return &mockCookieBaker_Issue_Call{Call: _e.mock.On("Issue", data, ttl)}
 }
 

foodgroup/mock_feedbag_manager_test.go

@@ -19,10 +19,19 @@ func newMockFeedbagManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockFeedbagManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockFeedbagManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -76,7 +85,7 @@ type mockFeedbagManager_Feedbag_Call struct {
 // Feedbag is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockFeedbagManager_Expecter) Feedbag(ctx interface{}, screenName interface{}) *mockFeedbagManager_Feedbag_Call {
+func (_e *mockFeedbagManager_Expecter) Feedbag(ctx any, screenName any) *mockFeedbagManager_Feedbag_Call {
 	return &mockFeedbagManager_Feedbag_Call{Call: _e.mock.On("Feedbag", ctx, screenName)}
 }
 
@@ -134,7 +143,7 @@ type mockFeedbagManager_FeedbagDelete_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - items []wire.FeedbagItem
-func (_e *mockFeedbagManager_Expecter) FeedbagDelete(ctx interface{}, screenName interface{}, items interface{}) *mockFeedbagManager_FeedbagDelete_Call {
+func (_e *mockFeedbagManager_Expecter) FeedbagDelete(ctx any, screenName any, items any) *mockFeedbagManager_FeedbagDelete_Call {
 	return &mockFeedbagManager_FeedbagDelete_Call{Call: _e.mock.On("FeedbagDelete", ctx, screenName, items)}
 }
 
@@ -205,7 +214,7 @@ type mockFeedbagManager_FeedbagLastModified_Call struct {
 // FeedbagLastModified is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockFeedbagManager_Expecter) FeedbagLastModified(ctx interface{}, screenName interface{}) *mockFeedbagManager_FeedbagLastModified_Call {
+func (_e *mockFeedbagManager_Expecter) FeedbagLastModified(ctx any, screenName any) *mockFeedbagManager_FeedbagLastModified_Call {
 	return &mockFeedbagManager_FeedbagLastModified_Call{Call: _e.mock.On("FeedbagLastModified", ctx, screenName)}
 }
 
@@ -263,7 +272,7 @@ type mockFeedbagManager_FeedbagUpsert_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - items []wire.FeedbagItem
-func (_e *mockFeedbagManager_Expecter) FeedbagUpsert(ctx interface{}, screenName interface{}, items interface{}) *mockFeedbagManager_FeedbagUpsert_Call {
+func (_e *mockFeedbagManager_Expecter) FeedbagUpsert(ctx any, screenName any, items any) *mockFeedbagManager_FeedbagUpsert_Call {
 	return &mockFeedbagManager_FeedbagUpsert_Call{Call: _e.mock.On("FeedbagUpsert", ctx, screenName, items)}
 }
 
@@ -325,7 +334,7 @@ type mockFeedbagManager_UseFeedbag_Call struct {
 // UseFeedbag is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockFeedbagManager_Expecter) UseFeedbag(ctx interface{}, screenName interface{}) *mockFeedbagManager_UseFeedbag_Call {
+func (_e *mockFeedbagManager_Expecter) UseFeedbag(ctx any, screenName any) *mockFeedbagManager_UseFeedbag_Call {
 	return &mockFeedbagManager_UseFeedbag_Call{Call: _e.mock.On("UseFeedbag", ctx, screenName)}
 }
 

foodgroup/mock_icq_user_finder_test.go

@@ -17,10 +17,19 @@ func newMockICQUserFinder(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICQUserFinder {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICQUserFinder{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -72,7 +81,7 @@ type mockICQUserFinder_FindByICQEmail_Call struct {
 // FindByICQEmail is a helper method to define mock.On call
 //   - ctx context.Context
 //   - email string
-func (_e *mockICQUserFinder_Expecter) FindByICQEmail(ctx interface{}, email interface{}) *mockICQUserFinder_FindByICQEmail_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQEmail(ctx any, email any) *mockICQUserFinder_FindByICQEmail_Call {
 	return &mockICQUserFinder_FindByICQEmail_Call{Call: _e.mock.On("FindByICQEmail", ctx, email)}
 }
 
@@ -141,7 +150,7 @@ type mockICQUserFinder_FindByICQInterests_Call struct {
 //   - ctx context.Context
 //   - code uint16
 //   - keywords []string
-func (_e *mockICQUserFinder_Expecter) FindByICQInterests(ctx interface{}, code interface{}, keywords interface{}) *mockICQUserFinder_FindByICQInterests_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQInterests(ctx any, code any, keywords any) *mockICQUserFinder_FindByICQInterests_Call {
 	return &mockICQUserFinder_FindByICQInterests_Call{Call: _e.mock.On("FindByICQInterests", ctx, code, keywords)}
 }
 
@@ -214,7 +223,7 @@ type mockICQUserFinder_FindByICQKeyword_Call struct {
 // FindByICQKeyword is a helper method to define mock.On call
 //   - ctx context.Context
 //   - keyword string
-func (_e *mockICQUserFinder_Expecter) FindByICQKeyword(ctx interface{}, keyword interface{}) *mockICQUserFinder_FindByICQKeyword_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQKeyword(ctx any, keyword any) *mockICQUserFinder_FindByICQKeyword_Call {
 	return &mockICQUserFinder_FindByICQKeyword_Call{Call: _e.mock.On("FindByICQKeyword", ctx, keyword)}
 }
 
@@ -284,7 +293,7 @@ type mockICQUserFinder_FindByICQName_Call struct {
 //   - firstName string
 //   - lastName string
 //   - nickName string
-func (_e *mockICQUserFinder_Expecter) FindByICQName(ctx interface{}, firstName interface{}, lastName interface{}, nickName interface{}) *mockICQUserFinder_FindByICQName_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQName(ctx any, firstName any, lastName any, nickName any) *mockICQUserFinder_FindByICQName_Call {
 	return &mockICQUserFinder_FindByICQName_Call{Call: _e.mock.On("FindByICQName", ctx, firstName, lastName, nickName)}
 }
 
@@ -360,7 +369,7 @@ type mockICQUserFinder_FindByUIN_Call struct {
 // FindByUIN is a helper method to define mock.On call
 //   - ctx context.Context
 //   - UIN uint32
-func (_e *mockICQUserFinder_Expecter) FindByUIN(ctx interface{}, UIN interface{}) *mockICQUserFinder_FindByUIN_Call {
+func (_e *mockICQUserFinder_Expecter) FindByUIN(ctx any, UIN any) *mockICQUserFinder_FindByUIN_Call {
 	return &mockICQUserFinder_FindByUIN_Call{Call: _e.mock.On("FindByUIN", ctx, UIN)}
 }
 
@@ -428,7 +437,7 @@ type mockICQUserFinder_SearchICQUsers_Call struct {
 // SearchICQUsers is a helper method to define mock.On call
 //   - ctx context.Context
 //   - c state.ICQUserSearchCriteria
-func (_e *mockICQUserFinder_Expecter) SearchICQUsers(ctx interface{}, c interface{}) *mockICQUserFinder_SearchICQUsers_Call {
+func (_e *mockICQUserFinder_Expecter) SearchICQUsers(ctx any, c any) *mockICQUserFinder_SearchICQUsers_Call {
 	return &mockICQUserFinder_SearchICQUsers_Call{Call: _e.mock.On("SearchICQUsers", ctx, c)}
 }
 

foodgroup/mock_icq_user_updater_test.go

@@ -17,10 +17,19 @@ func newMockICQUserUpdater(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICQUserUpdater {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICQUserUpdater{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -64,7 +73,7 @@ type mockICQUserUpdater_SetAffiliations_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQAffiliations
-func (_e *mockICQUserUpdater_Expecter) SetAffiliations(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetAffiliations_Call {
+func (_e *mockICQUserUpdater_Expecter) SetAffiliations(ctx any, name any, data any) *mockICQUserUpdater_SetAffiliations_Call {
 	return &mockICQUserUpdater_SetAffiliations_Call{Call: _e.mock.On("SetAffiliations", ctx, name, data)}
 }
 
@@ -127,7 +136,7 @@ type mockICQUserUpdater_SetBasicInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQBasicInfo
-func (_e *mockICQUserUpdater_Expecter) SetBasicInfo(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetBasicInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetBasicInfo(ctx any, name any, data any) *mockICQUserUpdater_SetBasicInfo_Call {
 	return &mockICQUserUpdater_SetBasicInfo_Call{Call: _e.mock.On("SetBasicInfo", ctx, name, data)}
 }
 
@@ -190,7 +199,7 @@ type mockICQUserUpdater_SetHomepageCategory_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQHomepageCategory
-func (_e *mockICQUserUpdater_Expecter) SetHomepageCategory(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetHomepageCategory_Call {
+func (_e *mockICQUserUpdater_Expecter) SetHomepageCategory(ctx any, name any, data any) *mockICQUserUpdater_SetHomepageCategory_Call {
 	return &mockICQUserUpdater_SetHomepageCategory_Call{Call: _e.mock.On("SetHomepageCategory", ctx, name, data)}
 }
 
@@ -253,7 +262,7 @@ type mockICQUserUpdater_SetICQInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - info state.ICQInfo
-func (_e *mockICQUserUpdater_Expecter) SetICQInfo(ctx interface{}, name interface{}, info interface{}) *mockICQUserUpdater_SetICQInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetICQInfo(ctx any, name any, info any) *mockICQUserUpdater_SetICQInfo_Call {
 	return &mockICQUserUpdater_SetICQInfo_Call{Call: _e.mock.On("SetICQInfo", ctx, name, info)}
 }
 
@@ -316,7 +325,7 @@ type mockICQUserUpdater_SetInterests_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQInterests
-func (_e *mockICQUserUpdater_Expecter) SetInterests(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetInterests_Call {
+func (_e *mockICQUserUpdater_Expecter) SetInterests(ctx any, name any, data any) *mockICQUserUpdater_SetInterests_Call {
 	return &mockICQUserUpdater_SetInterests_Call{Call: _e.mock.On("SetInterests", ctx, name, data)}
 }
 
@@ -379,7 +388,7 @@ type mockICQUserUpdater_SetMoreInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQMoreInfo
-func (_e *mockICQUserUpdater_Expecter) SetMoreInfo(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetMoreInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetMoreInfo(ctx any, name any, data any) *mockICQUserUpdater_SetMoreInfo_Call {
 	return &mockICQUserUpdater_SetMoreInfo_Call{Call: _e.mock.On("SetMoreInfo", ctx, name, data)}
 }
 
@@ -442,7 +451,7 @@ type mockICQUserUpdater_SetPermissions_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQPermissions
-func (_e *mockICQUserUpdater_Expecter) SetPermissions(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetPermissions_Call {
+func (_e *mockICQUserUpdater_Expecter) SetPermissions(ctx any, name any, data any) *mockICQUserUpdater_SetPermissions_Call {
 	return &mockICQUserUpdater_SetPermissions_Call{Call: _e.mock.On("SetPermissions", ctx, name, data)}
 }
 
@@ -505,7 +514,7 @@ type mockICQUserUpdater_SetUserNotes_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQUserNotes
-func (_e *mockICQUserUpdater_Expecter) SetUserNotes(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetUserNotes_Call {
+func (_e *mockICQUserUpdater_Expecter) SetUserNotes(ctx any, name any, data any) *mockICQUserUpdater_SetUserNotes_Call {
 	return &mockICQUserUpdater_SetUserNotes_Call{Call: _e.mock.On("SetUserNotes", ctx, name, data)}
 }
 
@@ -568,7 +577,7 @@ type mockICQUserUpdater_SetWorkInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQWorkInfo
-func (_e *mockICQUserUpdater_Expecter) SetWorkInfo(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetWorkInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetWorkInfo(ctx any, name any, data any) *mockICQUserUpdater_SetWorkInfo_Call {
 	return &mockICQUserUpdater_SetWorkInfo_Call{Call: _e.mock.On("SetWorkInfo", ctx, name, data)}
 }
 

foodgroup/mock_message_relayer_test.go

@@ -18,10 +18,19 @@ func newMockMessageRelayer(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockMessageRelayer {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockMessageRelayer{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -54,7 +63,7 @@ type mockMessageRelayer_RelayToOtherInstances_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - msg wire.SNACMessage
-func (_e *mockMessageRelayer_Expecter) RelayToOtherInstances(ctx interface{}, instance interface{}, msg interface{}) *mockMessageRelayer_RelayToOtherInstances_Call {
+func (_e *mockMessageRelayer_Expecter) RelayToOtherInstances(ctx any, instance any, msg any) *mockMessageRelayer_RelayToOtherInstances_Call {
 	return &mockMessageRelayer_RelayToOtherInstances_Call{Call: _e.mock.On("RelayToOtherInstances", ctx, instance, msg)}
 }
 
@@ -106,7 +115,7 @@ type mockMessageRelayer_RelayToScreenName_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - msg wire.SNACMessage
-func (_e *mockMessageRelayer_Expecter) RelayToScreenName(ctx interface{}, screenName interface{}, msg interface{}) *mockMessageRelayer_RelayToScreenName_Call {
+func (_e *mockMessageRelayer_Expecter) RelayToScreenName(ctx any, screenName any, msg any) *mockMessageRelayer_RelayToScreenName_Call {
 	return &mockMessageRelayer_RelayToScreenName_Call{Call: _e.mock.On("RelayToScreenName", ctx, screenName, msg)}
 }
 
@@ -158,7 +167,7 @@ type mockMessageRelayer_RelayToScreenNameActiveOnly_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - msg wire.SNACMessage
-func (_e *mockMessageRelayer_Expecter) RelayToScreenNameActiveOnly(ctx interface{}, screenName interface{}, msg interface{}) *mockMessageRelayer_RelayToScreenNameActiveOnly_Call {
+func (_e *mockMessageRelayer_Expecter) RelayToScreenNameActiveOnly(ctx any, screenName any, msg any) *mockMessageRelayer_RelayToScreenNameActiveOnly_Call {
 	return &mockMessageRelayer_RelayToScreenNameActiveOnly_Call{Call: _e.mock.On("RelayToScreenNameActiveOnly", ctx, screenName, msg)}
 }
 
@@ -210,7 +219,7 @@ type mockMessageRelayer_RelayToScreenNames_Call struct {
 //   - ctx context.Context
 //   - screenNames []state.IdentScreenName
 //   - msg wire.SNACMessage
-func (_e *mockMessageRelayer_Expecter) RelayToScreenNames(ctx interface{}, screenNames interface{}, msg interface{}) *mockMessageRelayer_RelayToScreenNames_Call {
+func (_e *mockMessageRelayer_Expecter) RelayToScreenNames(ctx any, screenNames any, msg any) *mockMessageRelayer_RelayToScreenNames_Call {
 	return &mockMessageRelayer_RelayToScreenNames_Call{Call: _e.mock.On("RelayToScreenNames", ctx, screenNames, msg)}
 }
 
@@ -262,7 +271,7 @@ type mockMessageRelayer_RelayToSelf_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - msg wire.SNACMessage
-func (_e *mockMessageRelayer_Expecter) RelayToSelf(ctx interface{}, instance interface{}, msg interface{}) *mockMessageRelayer_RelayToSelf_Call {
+func (_e *mockMessageRelayer_Expecter) RelayToSelf(ctx any, instance any, msg any) *mockMessageRelayer_RelayToSelf_Call {
 	return &mockMessageRelayer_RelayToSelf_Call{Call: _e.mock.On("RelayToSelf", ctx, instance, msg)}
 }
 

foodgroup/mock_offline_message_manager_test.go

@@ -17,10 +17,19 @@ func newMockOfflineMessageManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockOfflineMessageManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockOfflineMessageManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -63,7 +72,7 @@ type mockOfflineMessageManager_DeleteMessages_Call struct {
 // DeleteMessages is a helper method to define mock.On call
 //   - ctx context.Context
 //   - recip state.IdentScreenName
-func (_e *mockOfflineMessageManager_Expecter) DeleteMessages(ctx interface{}, recip interface{}) *mockOfflineMessageManager_DeleteMessages_Call {
+func (_e *mockOfflineMessageManager_Expecter) DeleteMessages(ctx any, recip any) *mockOfflineMessageManager_DeleteMessages_Call {
 	return &mockOfflineMessageManager_DeleteMessages_Call{Call: _e.mock.On("DeleteMessages", ctx, recip)}
 }
 
@@ -131,7 +140,7 @@ type mockOfflineMessageManager_RetrieveMessages_Call struct {
 // RetrieveMessages is a helper method to define mock.On call
 //   - ctx context.Context
 //   - recip state.IdentScreenName
-func (_e *mockOfflineMessageManager_Expecter) RetrieveMessages(ctx interface{}, recip interface{}) *mockOfflineMessageManager_RetrieveMessages_Call {
+func (_e *mockOfflineMessageManager_Expecter) RetrieveMessages(ctx any, recip any) *mockOfflineMessageManager_RetrieveMessages_Call {
 	return &mockOfflineMessageManager_RetrieveMessages_Call{Call: _e.mock.On("RetrieveMessages", ctx, recip)}
 }
 
@@ -197,7 +206,7 @@ type mockOfflineMessageManager_SaveMessage_Call struct {
 // SaveMessage is a helper method to define mock.On call
 //   - ctx context.Context
 //   - offlineMessage state.OfflineMessage
-func (_e *mockOfflineMessageManager_Expecter) SaveMessage(ctx interface{}, offlineMessage interface{}) *mockOfflineMessageManager_SaveMessage_Call {
+func (_e *mockOfflineMessageManager_Expecter) SaveMessage(ctx any, offlineMessage any) *mockOfflineMessageManager_SaveMessage_Call {
 	return &mockOfflineMessageManager_SaveMessage_Call{Call: _e.mock.On("SaveMessage", ctx, offlineMessage)}
 }
 
@@ -255,7 +264,7 @@ type mockOfflineMessageManager_SetOfflineMsgCount_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - count int
-func (_e *mockOfflineMessageManager_Expecter) SetOfflineMsgCount(ctx interface{}, screenName interface{}, count interface{}) *mockOfflineMessageManager_SetOfflineMsgCount_Call {
+func (_e *mockOfflineMessageManager_Expecter) SetOfflineMsgCount(ctx any, screenName any, count any) *mockOfflineMessageManager_SetOfflineMsgCount_Call {
 	return &mockOfflineMessageManager_SetOfflineMsgCount_Call{Call: _e.mock.On("SetOfflineMsgCount", ctx, screenName, count)}
 }
 

foodgroup/mock_profile_manager_test.go

@@ -18,10 +18,19 @@ func newMockProfileManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockProfileManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockProfileManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockProfileManager_FindByAIMEmail_Call struct {
 // FindByAIMEmail is a helper method to define mock.On call
 //   - ctx context.Context
 //   - email string
-func (_e *mockProfileManager_Expecter) FindByAIMEmail(ctx interface{}, email interface{}) *mockProfileManager_FindByAIMEmail_Call {
+func (_e *mockProfileManager_Expecter) FindByAIMEmail(ctx any, email any) *mockProfileManager_FindByAIMEmail_Call {
 	return &mockProfileManager_FindByAIMEmail_Call{Call: _e.mock.On("FindByAIMEmail", ctx, email)}
 }
 
@@ -141,7 +150,7 @@ type mockProfileManager_FindByAIMKeyword_Call struct {
 // FindByAIMKeyword is a helper method to define mock.On call
 //   - ctx context.Context
 //   - keyword string
-func (_e *mockProfileManager_Expecter) FindByAIMKeyword(ctx interface{}, keyword interface{}) *mockProfileManager_FindByAIMKeyword_Call {
+func (_e *mockProfileManager_Expecter) FindByAIMKeyword(ctx any, keyword any) *mockProfileManager_FindByAIMKeyword_Call {
 	return &mockProfileManager_FindByAIMKeyword_Call{Call: _e.mock.On("FindByAIMKeyword", ctx, keyword)}
 }
 
@@ -209,7 +218,7 @@ type mockProfileManager_FindByAIMNameAndAddr_Call struct {
 // FindByAIMNameAndAddr is a helper method to define mock.On call
 //   - ctx context.Context
 //   - info state.AIMNameAndAddr
-func (_e *mockProfileManager_Expecter) FindByAIMNameAndAddr(ctx interface{}, info interface{}) *mockProfileManager_FindByAIMNameAndAddr_Call {
+func (_e *mockProfileManager_Expecter) FindByAIMNameAndAddr(ctx any, info any) *mockProfileManager_FindByAIMNameAndAddr_Call {
 	return &mockProfileManager_FindByAIMNameAndAddr_Call{Call: _e.mock.On("FindByAIMNameAndAddr", ctx, info)}
 }
 
@@ -276,7 +285,7 @@ type mockProfileManager_InterestList_Call struct {
 
 // InterestList is a helper method to define mock.On call
 //   - ctx context.Context
-func (_e *mockProfileManager_Expecter) InterestList(ctx interface{}) *mockProfileManager_InterestList_Call {
+func (_e *mockProfileManager_Expecter) InterestList(ctx any) *mockProfileManager_InterestList_Call {
 	return &mockProfileManager_InterestList_Call{Call: _e.mock.On("InterestList", ctx)}
 }
 
@@ -337,7 +346,7 @@ type mockProfileManager_Profile_Call struct {
 // Profile is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockProfileManager_Expecter) Profile(ctx interface{}, screenName interface{}) *mockProfileManager_Profile_Call {
+func (_e *mockProfileManager_Expecter) Profile(ctx any, screenName any) *mockProfileManager_Profile_Call {
 	return &mockProfileManager_Profile_Call{Call: _e.mock.On("Profile", ctx, screenName)}
 }
 
@@ -395,7 +404,7 @@ type mockProfileManager_SetDirectoryInfo_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - info state.AIMNameAndAddr
-func (_e *mockProfileManager_Expecter) SetDirectoryInfo(ctx interface{}, screenName interface{}, info interface{}) *mockProfileManager_SetDirectoryInfo_Call {
+func (_e *mockProfileManager_Expecter) SetDirectoryInfo(ctx any, screenName any, info any) *mockProfileManager_SetDirectoryInfo_Call {
 	return &mockProfileManager_SetDirectoryInfo_Call{Call: _e.mock.On("SetDirectoryInfo", ctx, screenName, info)}
 }
 
@@ -458,7 +467,7 @@ type mockProfileManager_SetKeywords_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - keywords [5]string
-func (_e *mockProfileManager_Expecter) SetKeywords(ctx interface{}, screenName interface{}, keywords interface{}) *mockProfileManager_SetKeywords_Call {
+func (_e *mockProfileManager_Expecter) SetKeywords(ctx any, screenName any, keywords any) *mockProfileManager_SetKeywords_Call {
 	return &mockProfileManager_SetKeywords_Call{Call: _e.mock.On("SetKeywords", ctx, screenName, keywords)}
 }
 
@@ -521,7 +530,7 @@ type mockProfileManager_SetProfile_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - profile state.UserProfile
-func (_e *mockProfileManager_Expecter) SetProfile(ctx interface{}, screenName interface{}, profile interface{}) *mockProfileManager_SetProfile_Call {
+func (_e *mockProfileManager_Expecter) SetProfile(ctx any, screenName any, profile any) *mockProfileManager_SetProfile_Call {
 	return &mockProfileManager_SetProfile_Call{Call: _e.mock.On("SetProfile", ctx, screenName, profile)}
 }
 
@@ -594,7 +603,7 @@ type mockProfileManager_User_Call struct {
 // User is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockProfileManager_Expecter) User(ctx interface{}, screenName interface{}) *mockProfileManager_User_Call {
+func (_e *mockProfileManager_Expecter) User(ctx any, screenName any) *mockProfileManager_User_Call {
 	return &mockProfileManager_User_Call{Call: _e.mock.On("User", ctx, screenName)}
 }
 

foodgroup/mock_relationship_fetcher_test.go

@@ -17,10 +17,19 @@ func newMockRelationshipFetcher(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockRelationshipFetcher {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockRelationshipFetcher{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockRelationshipFetcher_AllRelationships_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - filter []state.IdentScreenName
-func (_e *mockRelationshipFetcher_Expecter) AllRelationships(ctx interface{}, me interface{}, filter interface{}) *mockRelationshipFetcher_AllRelationships_Call {
+func (_e *mockRelationshipFetcher_Expecter) AllRelationships(ctx any, me any, filter any) *mockRelationshipFetcher_AllRelationships_Call {
 	return &mockRelationshipFetcher_AllRelationships_Call{Call: _e.mock.On("AllRelationships", ctx, me, filter)}
 }
 
@@ -147,7 +156,7 @@ type mockRelationshipFetcher_Relationship_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockRelationshipFetcher_Expecter) Relationship(ctx interface{}, me interface{}, them interface{}) *mockRelationshipFetcher_Relationship_Call {
+func (_e *mockRelationshipFetcher_Expecter) Relationship(ctx any, me any, them any) *mockRelationshipFetcher_Relationship_Call {
 	return &mockRelationshipFetcher_Relationship_Call{Call: _e.mock.On("Relationship", ctx, me, them)}
 }
 

foodgroup/mock_session_registry_test.go

@@ -17,10 +17,19 @@ func newMockSessionRegistry(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockSessionRegistry {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockSessionRegistry{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -41,11 +50,11 @@ func (_m *mockSessionRegistry) EXPECT() *mockSessionRegistry_Expecter {
 // AddSession provides a mock function for the type mockSessionRegistry
 func (_mock *mockSessionRegistry) AddSession(ctx context.Context, screenName state.DisplayScreenName, doMultiSess bool, cfg ...func(sess *state.Session)) (*state.SessionInstance, error) {
 	// func(sess *state.Session)
-	_va := make([]interface{}, len(cfg))
+	_va := make([]any, len(cfg))
 	for _i := range cfg {
 		_va[_i] = cfg[_i]
 	}
-	var _ca []interface{}
+	var _ca []any
 	_ca = append(_ca, ctx, screenName, doMultiSess)
 	_ca = append(_ca, _va...)
 	ret := _mock.Called(_ca...)
@@ -84,9 +93,9 @@ type mockSessionRegistry_AddSession_Call struct {
 //   - screenName state.DisplayScreenName
 //   - doMultiSess bool
 //   - cfg ...func(sess *state.Session)
-func (_e *mockSessionRegistry_Expecter) AddSession(ctx interface{}, screenName interface{}, doMultiSess interface{}, cfg ...interface{}) *mockSessionRegistry_AddSession_Call {
+func (_e *mockSessionRegistry_Expecter) AddSession(ctx any, screenName any, doMultiSess any, cfg ...any) *mockSessionRegistry_AddSession_Call {
 	return &mockSessionRegistry_AddSession_Call{Call: _e.mock.On("AddSession",
-		append([]interface{}{ctx, screenName, doMultiSess}, cfg...)...)}
+		append([]any{ctx, screenName, doMultiSess}, cfg...)...)}
 }
 
 func (_c *mockSessionRegistry_AddSession_Call) Run(run func(ctx context.Context, screenName state.DisplayScreenName, doMultiSess bool, cfg ...func(sess *state.Session))) *mockSessionRegistry_AddSession_Call {
@@ -144,7 +153,7 @@ type mockSessionRegistry_RemoveSession_Call struct {
 
 // RemoveSession is a helper method to define mock.On call
 //   - session *state.Session
-func (_e *mockSessionRegistry_Expecter) RemoveSession(session interface{}) *mockSessionRegistry_RemoveSession_Call {
+func (_e *mockSessionRegistry_Expecter) RemoveSession(session any) *mockSessionRegistry_RemoveSession_Call {
 	return &mockSessionRegistry_RemoveSession_Call{Call: _e.mock.On("RemoveSession", session)}
 }
 

foodgroup/mock_session_retriever_test.go

@@ -15,10 +15,19 @@ func newMockSessionRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockSessionRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockSessionRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -62,7 +71,7 @@ type mockSessionRetriever_RetrieveSession_Call struct {
 
 // RetrieveSession is a helper method to define mock.On call
 //   - screenName state.IdentScreenName
-func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName interface{}) *mockSessionRetriever_RetrieveSession_Call {
+func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName any) *mockSessionRetriever_RetrieveSession_Call {
 	return &mockSessionRetriever_RetrieveSession_Call{Call: _e.mock.On("RetrieveSession", screenName)}
 }
 

foodgroup/mock_user_manager_manager_test.go

@@ -18,10 +18,19 @@ func newMockUserManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockUserManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockUserManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -64,7 +73,7 @@ type mockUserManager_InsertUser_Call struct {
 // InsertUser is a helper method to define mock.On call
 //   - ctx context.Context
 //   - u state.User
-func (_e *mockUserManager_Expecter) InsertUser(ctx interface{}, u interface{}) *mockUserManager_InsertUser_Call {
+func (_e *mockUserManager_Expecter) InsertUser(ctx any, u any) *mockUserManager_InsertUser_Call {
 	return &mockUserManager_InsertUser_Call{Call: _e.mock.On("InsertUser", ctx, u)}
 }
 
@@ -123,7 +132,7 @@ type mockUserManager_SetWarnLevel_Call struct {
 //   - user state.IdentScreenName
 //   - lastWarnUpdate time.Time
 //   - lastWarnLevel uint16
-func (_e *mockUserManager_Expecter) SetWarnLevel(ctx interface{}, user interface{}, lastWarnUpdate interface{}, lastWarnLevel interface{}) *mockUserManager_SetWarnLevel_Call {
+func (_e *mockUserManager_Expecter) SetWarnLevel(ctx any, user any, lastWarnUpdate any, lastWarnLevel any) *mockUserManager_SetWarnLevel_Call {
 	return &mockUserManager_SetWarnLevel_Call{Call: _e.mock.On("SetWarnLevel", ctx, user, lastWarnUpdate, lastWarnLevel)}
 }
 
@@ -201,7 +210,7 @@ type mockUserManager_User_Call struct {
 // User is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockUserManager_Expecter) User(ctx interface{}, screenName interface{}) *mockUserManager_User_Call {
+func (_e *mockUserManager_Expecter) User(ctx any, screenName any) *mockUserManager_User_Call {
 	return &mockUserManager_User_Call{Call: _e.mock.On("User", ctx, screenName)}
 }
 

server/http/mock_account_manager_test.go

@@ -18,10 +18,19 @@ func newMockAccountManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAccountManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAccountManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockAccountManager_ConfirmStatus_Call struct {
 // ConfirmStatus is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) ConfirmStatus(ctx interface{}, screenName interface{}) *mockAccountManager_ConfirmStatus_Call {
+func (_e *mockAccountManager_Expecter) ConfirmStatus(ctx any, screenName any) *mockAccountManager_ConfirmStatus_Call {
 	return &mockAccountManager_ConfirmStatus_Call{Call: _e.mock.On("ConfirmStatus", ctx, screenName)}
 }
 
@@ -141,7 +150,7 @@ type mockAccountManager_EmailAddress_Call struct {
 // EmailAddress is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) EmailAddress(ctx interface{}, screenName interface{}) *mockAccountManager_EmailAddress_Call {
+func (_e *mockAccountManager_Expecter) EmailAddress(ctx any, screenName any) *mockAccountManager_EmailAddress_Call {
 	return &mockAccountManager_EmailAddress_Call{Call: _e.mock.On("EmailAddress", ctx, screenName)}
 }
 
@@ -207,7 +216,7 @@ type mockAccountManager_RegStatus_Call struct {
 // RegStatus is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) RegStatus(ctx interface{}, screenName interface{}) *mockAccountManager_RegStatus_Call {
+func (_e *mockAccountManager_Expecter) RegStatus(ctx any, screenName any) *mockAccountManager_RegStatus_Call {
 	return &mockAccountManager_RegStatus_Call{Call: _e.mock.On("RegStatus", ctx, screenName)}
 }
 
@@ -265,7 +274,7 @@ type mockAccountManager_SetBotStatus_Call struct {
 //   - ctx context.Context
 //   - isBot bool
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) SetBotStatus(ctx interface{}, isBot interface{}, screenName interface{}) *mockAccountManager_SetBotStatus_Call {
+func (_e *mockAccountManager_Expecter) SetBotStatus(ctx any, isBot any, screenName any) *mockAccountManager_SetBotStatus_Call {
 	return &mockAccountManager_SetBotStatus_Call{Call: _e.mock.On("SetBotStatus", ctx, isBot, screenName)}
 }
 
@@ -328,7 +337,7 @@ type mockAccountManager_UpdateSuspendedStatus_Call struct {
 //   - ctx context.Context
 //   - suspendedStatus uint16
 //   - screenName state.IdentScreenName
-func (_e *mockAccountManager_Expecter) UpdateSuspendedStatus(ctx interface{}, suspendedStatus interface{}, screenName interface{}) *mockAccountManager_UpdateSuspendedStatus_Call {
+func (_e *mockAccountManager_Expecter) UpdateSuspendedStatus(ctx any, suspendedStatus any, screenName any) *mockAccountManager_UpdateSuspendedStatus_Call {
 	return &mockAccountManager_UpdateSuspendedStatus_Call{Call: _e.mock.On("UpdateSuspendedStatus", ctx, suspendedStatus, screenName)}
 }
 

server/http/mock_bart_asset_manager_test.go

@@ -17,10 +17,19 @@ func newMockBARTAssetManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBARTAssetManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBARTAssetManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockBARTAssetManager_BARTItem_Call struct {
 // BARTItem is a helper method to define mock.On call
 //   - ctx context.Context
 //   - hash []byte
-func (_e *mockBARTAssetManager_Expecter) BARTItem(ctx interface{}, hash interface{}) *mockBARTAssetManager_BARTItem_Call {
+func (_e *mockBARTAssetManager_Expecter) BARTItem(ctx any, hash any) *mockBARTAssetManager_BARTItem_Call {
 	return &mockBARTAssetManager_BARTItem_Call{Call: _e.mock.On("BARTItem", ctx, hash)}
 }
 
@@ -131,7 +140,7 @@ type mockBARTAssetManager_DeleteBARTItem_Call struct {
 // DeleteBARTItem is a helper method to define mock.On call
 //   - ctx context.Context
 //   - hash []byte
-func (_e *mockBARTAssetManager_Expecter) DeleteBARTItem(ctx interface{}, hash interface{}) *mockBARTAssetManager_DeleteBARTItem_Call {
+func (_e *mockBARTAssetManager_Expecter) DeleteBARTItem(ctx any, hash any) *mockBARTAssetManager_DeleteBARTItem_Call {
 	return &mockBARTAssetManager_DeleteBARTItem_Call{Call: _e.mock.On("DeleteBARTItem", ctx, hash)}
 }
 
@@ -190,7 +199,7 @@ type mockBARTAssetManager_InsertBARTItem_Call struct {
 //   - hash []byte
 //   - blob []byte
 //   - itemType uint16
-func (_e *mockBARTAssetManager_Expecter) InsertBARTItem(ctx interface{}, hash interface{}, blob interface{}, itemType interface{}) *mockBARTAssetManager_InsertBARTItem_Call {
+func (_e *mockBARTAssetManager_Expecter) InsertBARTItem(ctx any, hash any, blob any, itemType any) *mockBARTAssetManager_InsertBARTItem_Call {
 	return &mockBARTAssetManager_InsertBARTItem_Call{Call: _e.mock.On("InsertBARTItem", ctx, hash, blob, itemType)}
 }
 
@@ -268,7 +277,7 @@ type mockBARTAssetManager_ListBARTItems_Call struct {
 // ListBARTItems is a helper method to define mock.On call
 //   - ctx context.Context
 //   - itemType uint16
-func (_e *mockBARTAssetManager_Expecter) ListBARTItems(ctx interface{}, itemType interface{}) *mockBARTAssetManager_ListBARTItems_Call {
+func (_e *mockBARTAssetManager_Expecter) ListBARTItems(ctx any, itemType any) *mockBARTAssetManager_ListBARTItems_Call {
 	return &mockBARTAssetManager_ListBARTItems_Call{Call: _e.mock.On("ListBARTItems", ctx, itemType)}
 }
 

server/http/mock_buddy_broadcaster_test.go

@@ -17,10 +17,19 @@ func newMockBuddyBroadcaster(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyBroadcaster {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyBroadcaster{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockBuddyBroadcaster_BroadcastVisibility_Call struct {
 //   - you *state.SessionInstance
 //   - filter []state.IdentScreenName
 //   - sendDepartures bool
-func (_e *mockBuddyBroadcaster_Expecter) BroadcastVisibility(ctx interface{}, you interface{}, filter interface{}, sendDepartures interface{}) *mockBuddyBroadcaster_BroadcastVisibility_Call {
+func (_e *mockBuddyBroadcaster_Expecter) BroadcastVisibility(ctx any, you any, filter any, sendDepartures any) *mockBuddyBroadcaster_BroadcastVisibility_Call {
 	return &mockBuddyBroadcaster_BroadcastVisibility_Call{Call: _e.mock.On("BroadcastVisibility", ctx, you, filter, sendDepartures)}
 }
 

server/http/mock_chat_room_creator_test.go

@@ -17,10 +17,19 @@ func newMockChatRoomCreator(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatRoomCreator {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatRoomCreator{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -63,7 +72,7 @@ type mockChatRoomCreator_CreateChatRoom_Call struct {
 // CreateChatRoom is a helper method to define mock.On call
 //   - ctx context.Context
 //   - chatRoom *state.ChatRoom
-func (_e *mockChatRoomCreator_Expecter) CreateChatRoom(ctx interface{}, chatRoom interface{}) *mockChatRoomCreator_CreateChatRoom_Call {
+func (_e *mockChatRoomCreator_Expecter) CreateChatRoom(ctx any, chatRoom any) *mockChatRoomCreator_CreateChatRoom_Call {
 	return &mockChatRoomCreator_CreateChatRoom_Call{Call: _e.mock.On("CreateChatRoom", ctx, chatRoom)}
 }
 

server/http/mock_chat_room_retriever_test.go

@@ -17,10 +17,19 @@ func newMockChatRoomRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatRoomRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatRoomRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockChatRoomRetriever_AllChatRooms_Call struct {
 // AllChatRooms is a helper method to define mock.On call
 //   - ctx context.Context
 //   - exchange uint16
-func (_e *mockChatRoomRetriever_Expecter) AllChatRooms(ctx interface{}, exchange interface{}) *mockChatRoomRetriever_AllChatRooms_Call {
+func (_e *mockChatRoomRetriever_Expecter) AllChatRooms(ctx any, exchange any) *mockChatRoomRetriever_AllChatRooms_Call {
 	return &mockChatRoomRetriever_AllChatRooms_Call{Call: _e.mock.On("AllChatRooms", ctx, exchange)}
 }
 

server/http/mock_chat_session_retriever_test.go

@@ -15,10 +15,19 @@ func newMockChatSessionRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatSessionRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatSessionRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -62,7 +71,7 @@ type mockChatSessionRetriever_AllSessions_Call struct {
 
 // AllSessions is a helper method to define mock.On call
 //   - cookie string
-func (_e *mockChatSessionRetriever_Expecter) AllSessions(cookie interface{}) *mockChatSessionRetriever_AllSessions_Call {
+func (_e *mockChatSessionRetriever_Expecter) AllSessions(cookie any) *mockChatSessionRetriever_AllSessions_Call {
 	return &mockChatSessionRetriever_AllSessions_Call{Call: _e.mock.On("AllSessions", cookie)}
 }
 

server/http/mock_directory_manager_test.go

@@ -17,10 +17,19 @@ func newMockDirectoryManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockDirectoryManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockDirectoryManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockDirectoryManager_Categories_Call struct {
 
 // Categories is a helper method to define mock.On call
 //   - ctx context.Context
-func (_e *mockDirectoryManager_Expecter) Categories(ctx interface{}) *mockDirectoryManager_Categories_Call {
+func (_e *mockDirectoryManager_Expecter) Categories(ctx any) *mockDirectoryManager_Categories_Call {
 	return &mockDirectoryManager_Categories_Call{Call: _e.mock.On("Categories", ctx)}
 }
 
@@ -134,7 +143,7 @@ type mockDirectoryManager_CreateCategory_Call struct {
 // CreateCategory is a helper method to define mock.On call
 //   - ctx context.Context
 //   - name string
-func (_e *mockDirectoryManager_Expecter) CreateCategory(ctx interface{}, name interface{}) *mockDirectoryManager_CreateCategory_Call {
+func (_e *mockDirectoryManager_Expecter) CreateCategory(ctx any, name any) *mockDirectoryManager_CreateCategory_Call {
 	return &mockDirectoryManager_CreateCategory_Call{Call: _e.mock.On("CreateCategory", ctx, name)}
 }
 
@@ -201,7 +210,7 @@ type mockDirectoryManager_CreateKeyword_Call struct {
 //   - ctx context.Context
 //   - name string
 //   - categoryID uint8
-func (_e *mockDirectoryManager_Expecter) CreateKeyword(ctx interface{}, name interface{}, categoryID interface{}) *mockDirectoryManager_CreateKeyword_Call {
+func (_e *mockDirectoryManager_Expecter) CreateKeyword(ctx any, name any, categoryID any) *mockDirectoryManager_CreateKeyword_Call {
 	return &mockDirectoryManager_CreateKeyword_Call{Call: _e.mock.On("CreateKeyword", ctx, name, categoryID)}
 }
 
@@ -263,7 +272,7 @@ type mockDirectoryManager_DeleteCategory_Call struct {
 // DeleteCategory is a helper method to define mock.On call
 //   - ctx context.Context
 //   - categoryID uint8
-func (_e *mockDirectoryManager_Expecter) DeleteCategory(ctx interface{}, categoryID interface{}) *mockDirectoryManager_DeleteCategory_Call {
+func (_e *mockDirectoryManager_Expecter) DeleteCategory(ctx any, categoryID any) *mockDirectoryManager_DeleteCategory_Call {
 	return &mockDirectoryManager_DeleteCategory_Call{Call: _e.mock.On("DeleteCategory", ctx, categoryID)}
 }
 
@@ -320,7 +329,7 @@ type mockDirectoryManager_DeleteKeyword_Call struct {
 // DeleteKeyword is a helper method to define mock.On call
 //   - ctx context.Context
 //   - id uint8
-func (_e *mockDirectoryManager_Expecter) DeleteKeyword(ctx interface{}, id interface{}) *mockDirectoryManager_DeleteKeyword_Call {
+func (_e *mockDirectoryManager_Expecter) DeleteKeyword(ctx any, id any) *mockDirectoryManager_DeleteKeyword_Call {
 	return &mockDirectoryManager_DeleteKeyword_Call{Call: _e.mock.On("DeleteKeyword", ctx, id)}
 }
 
@@ -388,7 +397,7 @@ type mockDirectoryManager_KeywordsByCategory_Call struct {
 // KeywordsByCategory is a helper method to define mock.On call
 //   - ctx context.Context
 //   - categoryID uint8
-func (_e *mockDirectoryManager_Expecter) KeywordsByCategory(ctx interface{}, categoryID interface{}) *mockDirectoryManager_KeywordsByCategory_Call {
+func (_e *mockDirectoryManager_Expecter) KeywordsByCategory(ctx any, categoryID any) *mockDirectoryManager_KeywordsByCategory_Call {
 	return &mockDirectoryManager_KeywordsByCategory_Call{Call: _e.mock.On("KeywordsByCategory", ctx, categoryID)}
 }
 

server/http/mock_feedbag_retriever_test.go

@@ -18,10 +18,19 @@ func newMockFeedBagRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockFeedBagRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockFeedBagRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockFeedBagRetriever_BuddyIconMetadata_Call struct {
 // BuddyIconMetadata is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockFeedBagRetriever_Expecter) BuddyIconMetadata(ctx interface{}, screenName interface{}) *mockFeedBagRetriever_BuddyIconMetadata_Call {
+func (_e *mockFeedBagRetriever_Expecter) BuddyIconMetadata(ctx any, screenName any) *mockFeedBagRetriever_BuddyIconMetadata_Call {
 	return &mockFeedBagRetriever_BuddyIconMetadata_Call{Call: _e.mock.On("BuddyIconMetadata", ctx, screenName)}
 }
 

server/http/mock_message_relayer_test.go

@@ -18,10 +18,19 @@ func newMockMessageRelayer(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockMessageRelayer {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockMessageRelayer{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -54,7 +63,7 @@ type mockMessageRelayer_RelayToScreenName_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - msg wire.SNACMessage
-func (_e *mockMessageRelayer_Expecter) RelayToScreenName(ctx interface{}, screenName interface{}, msg interface{}) *mockMessageRelayer_RelayToScreenName_Call {
+func (_e *mockMessageRelayer_Expecter) RelayToScreenName(ctx any, screenName any, msg any) *mockMessageRelayer_RelayToScreenName_Call {
 	return &mockMessageRelayer_RelayToScreenName_Call{Call: _e.mock.On("RelayToScreenName", ctx, screenName, msg)}
 }
 

server/http/mock_profile_retriever_test.go

@@ -17,10 +17,19 @@ func newMockProfileRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockProfileRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockProfileRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -72,7 +81,7 @@ type mockProfileRetriever_Profile_Call struct {
 // Profile is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockProfileRetriever_Expecter) Profile(ctx interface{}, screenName interface{}) *mockProfileRetriever_Profile_Call {
+func (_e *mockProfileRetriever_Expecter) Profile(ctx any, screenName any) *mockProfileRetriever_Profile_Call {
 	return &mockProfileRetriever_Profile_Call{Call: _e.mock.On("Profile", ctx, screenName)}
 }
 

server/http/mock_session_retriever_test.go

@@ -15,10 +15,19 @@ func newMockSessionRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockSessionRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockSessionRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -108,7 +117,7 @@ type mockSessionRetriever_RetrieveSession_Call struct {
 
 // RetrieveSession is a helper method to define mock.On call
 //   - screenName state.IdentScreenName
-func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName interface{}) *mockSessionRetriever_RetrieveSession_Call {
+func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName any) *mockSessionRetriever_RetrieveSession_Call {
 	return &mockSessionRetriever_RetrieveSession_Call{Call: _e.mock.On("RetrieveSession", screenName)}
 }
 

server/http/mock_user_manager_test.go

@@ -17,10 +17,19 @@ func newMockUserManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockUserManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockUserManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockUserManager_AllUsers_Call struct {
 
 // AllUsers is a helper method to define mock.On call
 //   - ctx context.Context
-func (_e *mockUserManager_Expecter) AllUsers(ctx interface{}) *mockUserManager_AllUsers_Call {
+func (_e *mockUserManager_Expecter) AllUsers(ctx any) *mockUserManager_AllUsers_Call {
 	return &mockUserManager_AllUsers_Call{Call: _e.mock.On("AllUsers", ctx)}
 }
 
@@ -125,7 +134,7 @@ type mockUserManager_DeleteUser_Call struct {
 // DeleteUser is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockUserManager_Expecter) DeleteUser(ctx interface{}, screenName interface{}) *mockUserManager_DeleteUser_Call {
+func (_e *mockUserManager_Expecter) DeleteUser(ctx any, screenName any) *mockUserManager_DeleteUser_Call {
 	return &mockUserManager_DeleteUser_Call{Call: _e.mock.On("DeleteUser", ctx, screenName)}
 }
 
@@ -182,7 +191,7 @@ type mockUserManager_InsertUser_Call struct {
 // InsertUser is a helper method to define mock.On call
 //   - ctx context.Context
 //   - u state.User
-func (_e *mockUserManager_Expecter) InsertUser(ctx interface{}, u interface{}) *mockUserManager_InsertUser_Call {
+func (_e *mockUserManager_Expecter) InsertUser(ctx any, u any) *mockUserManager_InsertUser_Call {
 	return &mockUserManager_InsertUser_Call{Call: _e.mock.On("InsertUser", ctx, u)}
 }
 
@@ -240,7 +249,7 @@ type mockUserManager_SetUserPassword_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - newPassword string
-func (_e *mockUserManager_Expecter) SetUserPassword(ctx interface{}, screenName interface{}, newPassword interface{}) *mockUserManager_SetUserPassword_Call {
+func (_e *mockUserManager_Expecter) SetUserPassword(ctx any, screenName any, newPassword any) *mockUserManager_SetUserPassword_Call {
 	return &mockUserManager_SetUserPassword_Call{Call: _e.mock.On("SetUserPassword", ctx, screenName, newPassword)}
 }
 
@@ -313,7 +322,7 @@ type mockUserManager_User_Call struct {
 // User is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockUserManager_Expecter) User(ctx interface{}, screenName interface{}) *mockUserManager_User_Call {
+func (_e *mockUserManager_Expecter) User(ctx any, screenName any) *mockUserManager_User_Call {
 	return &mockUserManager_User_Call{Call: _e.mock.On("User", ctx, screenName)}
 }
 

server/icq_legacy/mock_account_manager_test.go

@@ -17,10 +17,19 @@ func newMockAccountManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAccountManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAccountManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -64,7 +73,7 @@ type mockAccountManager_SetUserPassword_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - newPassword string
-func (_e *mockAccountManager_Expecter) SetUserPassword(ctx interface{}, screenName interface{}, newPassword interface{}) *mockAccountManager_SetUserPassword_Call {
+func (_e *mockAccountManager_Expecter) SetUserPassword(ctx any, screenName any, newPassword any) *mockAccountManager_SetUserPassword_Call {
 	return &mockAccountManager_SetUserPassword_Call{Call: _e.mock.On("SetUserPassword", ctx, screenName, newPassword)}
 }
 

server/icq_legacy/mock_auth_service_test.go

@@ -20,10 +20,19 @@ func newMockAuthService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAuthService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAuthService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -80,7 +89,7 @@ type mockAuthService_CrackCookie_Call struct {
 
 // CrackCookie is a helper method to define mock.On call
 //   - authCookie []byte
-func (_e *mockAuthService_Expecter) CrackCookie(authCookie interface{}) *mockAuthService_CrackCookie_Call {
+func (_e *mockAuthService_Expecter) CrackCookie(authCookie any) *mockAuthService_CrackCookie_Call {
 	return &mockAuthService_CrackCookie_Call{Call: _e.mock.On("CrackCookie", authCookie)}
 }
 
@@ -142,7 +151,7 @@ type mockAuthService_FLAPLogin_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.FLAPSignonFrame
 //   - endpointCfg config.Endpoint
-func (_e *mockAuthService_Expecter) FLAPLogin(ctx interface{}, inFrame interface{}, endpointCfg interface{}) *mockAuthService_FLAPLogin_Call {
+func (_e *mockAuthService_Expecter) FLAPLogin(ctx any, inFrame any, endpointCfg any) *mockAuthService_FLAPLogin_Call {
 	return &mockAuthService_FLAPLogin_Call{Call: _e.mock.On("FLAPLogin", ctx, inFrame, endpointCfg)}
 }
 
@@ -216,7 +225,7 @@ type mockAuthService_RegisterBOSSession_Call struct {
 //   - ctx context.Context
 //   - authCookie state.ServerCookie
 //   - cfg func(*state.Session)
-func (_e *mockAuthService_Expecter) RegisterBOSSession(ctx interface{}, authCookie interface{}, cfg interface{}) *mockAuthService_RegisterBOSSession_Call {
+func (_e *mockAuthService_Expecter) RegisterBOSSession(ctx any, authCookie any, cfg any) *mockAuthService_RegisterBOSSession_Call {
 	return &mockAuthService_RegisterBOSSession_Call{Call: _e.mock.On("RegisterBOSSession", ctx, authCookie, cfg)}
 }
 

server/icq_legacy/mock_buddy_broadcaster_test.go

@@ -18,10 +18,19 @@ func newMockBuddyBroadcaster(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyBroadcaster {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyBroadcaster{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockBuddyBroadcaster_BroadcastBuddyArrived_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - userInfo wire.TLVUserInfo
-func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyArrived(ctx interface{}, screenName interface{}, userInfo interface{}) *mockBuddyBroadcaster_BroadcastBuddyArrived_Call {
+func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyArrived(ctx any, screenName any, userInfo any) *mockBuddyBroadcaster_BroadcastBuddyArrived_Call {
 	return &mockBuddyBroadcaster_BroadcastBuddyArrived_Call{Call: _e.mock.On("BroadcastBuddyArrived", ctx, screenName, userInfo)}
 }
 
@@ -127,7 +136,7 @@ type mockBuddyBroadcaster_BroadcastBuddyDeparted_Call struct {
 // BroadcastBuddyDeparted is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyDeparted(ctx interface{}, screenName interface{}) *mockBuddyBroadcaster_BroadcastBuddyDeparted_Call {
+func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyDeparted(ctx any, screenName any) *mockBuddyBroadcaster_BroadcastBuddyDeparted_Call {
 	return &mockBuddyBroadcaster_BroadcastBuddyDeparted_Call{Call: _e.mock.On("BroadcastBuddyDeparted", ctx, screenName)}
 }
 

server/icq_legacy/mock_buddy_list_registry_test.go

@@ -17,10 +17,19 @@ func newMockBuddyListRegistry(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyListRegistry {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyListRegistry{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -63,7 +72,7 @@ type mockBuddyListRegistry_RegisterBuddyList_Call struct {
 // RegisterBuddyList is a helper method to define mock.On call
 //   - ctx context.Context
 //   - user state.IdentScreenName
-func (_e *mockBuddyListRegistry_Expecter) RegisterBuddyList(ctx interface{}, user interface{}) *mockBuddyListRegistry_RegisterBuddyList_Call {
+func (_e *mockBuddyListRegistry_Expecter) RegisterBuddyList(ctx any, user any) *mockBuddyListRegistry_RegisterBuddyList_Call {
 	return &mockBuddyListRegistry_RegisterBuddyList_Call{Call: _e.mock.On("RegisterBuddyList", ctx, user)}
 }
 
@@ -120,7 +129,7 @@ type mockBuddyListRegistry_UnregisterBuddyList_Call struct {
 // UnregisterBuddyList is a helper method to define mock.On call
 //   - ctx context.Context
 //   - user state.IdentScreenName
-func (_e *mockBuddyListRegistry_Expecter) UnregisterBuddyList(ctx interface{}, user interface{}) *mockBuddyListRegistry_UnregisterBuddyList_Call {
+func (_e *mockBuddyListRegistry_Expecter) UnregisterBuddyList(ctx any, user any) *mockBuddyListRegistry_UnregisterBuddyList_Call {
 	return &mockBuddyListRegistry_UnregisterBuddyList_Call{Call: _e.mock.On("UnregisterBuddyList", ctx, user)}
 }
 

server/icq_legacy/mock_buddy_service_test.go

@@ -18,10 +18,19 @@ func newMockBuddyService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockBuddyService_AddBuddies_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x03_0x04_BuddyAddBuddies
-func (_e *mockBuddyService_Expecter) AddBuddies(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockBuddyService_AddBuddies_Call {
+func (_e *mockBuddyService_Expecter) AddBuddies(ctx any, instance any, inFrame any, inBody any) *mockBuddyService_AddBuddies_Call {
 	return &mockBuddyService_AddBuddies_Call{Call: _e.mock.On("AddBuddies", ctx, instance, inFrame, inBody)}
 }
 

server/icq_legacy/mock_feedbag_manager_test.go

@@ -18,10 +18,19 @@ func newMockFeedbagManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockFeedbagManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockFeedbagManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockFeedbagManager_Feedbag_Call struct {
 // Feedbag is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockFeedbagManager_Expecter) Feedbag(ctx interface{}, screenName interface{}) *mockFeedbagManager_Feedbag_Call {
+func (_e *mockFeedbagManager_Expecter) Feedbag(ctx any, screenName any) *mockFeedbagManager_Feedbag_Call {
 	return &mockFeedbagManager_Feedbag_Call{Call: _e.mock.On("Feedbag", ctx, screenName)}
 }
 
@@ -133,7 +142,7 @@ type mockFeedbagManager_FeedbagUpsert_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - items []wire.FeedbagItem
-func (_e *mockFeedbagManager_Expecter) FeedbagUpsert(ctx interface{}, screenName interface{}, items interface{}) *mockFeedbagManager_FeedbagUpsert_Call {
+func (_e *mockFeedbagManager_Expecter) FeedbagUpsert(ctx any, screenName any, items any) *mockFeedbagManager_FeedbagUpsert_Call {
 	return &mockFeedbagManager_FeedbagUpsert_Call{Call: _e.mock.On("FeedbagUpsert", ctx, screenName, items)}
 }
 

server/icq_legacy/mock_icbm_service_test.go

@@ -18,10 +18,19 @@ func newMockICBMService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICBMService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICBMService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockICBMService_ChannelMsgToHost_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x06_ICBMChannelMsgToHost
-func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ChannelMsgToHost_Call {
+func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ChannelMsgToHost_Call {
 	return &mockICBMService_ChannelMsgToHost_Call{Call: _e.mock.On("ChannelMsgToHost", ctx, instance, inFrame, inBody)}
 }
 

server/icq_legacy/mock_icq_user_finder_test.go

@@ -17,10 +17,19 @@ func newMockICQUserFinder(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICQUserFinder {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICQUserFinder{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -72,7 +81,7 @@ type mockICQUserFinder_FindByICQEmail_Call struct {
 // FindByICQEmail is a helper method to define mock.On call
 //   - ctx context.Context
 //   - email string
-func (_e *mockICQUserFinder_Expecter) FindByICQEmail(ctx interface{}, email interface{}) *mockICQUserFinder_FindByICQEmail_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQEmail(ctx any, email any) *mockICQUserFinder_FindByICQEmail_Call {
 	return &mockICQUserFinder_FindByICQEmail_Call{Call: _e.mock.On("FindByICQEmail", ctx, email)}
 }
 
@@ -141,7 +150,7 @@ type mockICQUserFinder_FindByICQInterests_Call struct {
 //   - ctx context.Context
 //   - code uint16
 //   - keywords []string
-func (_e *mockICQUserFinder_Expecter) FindByICQInterests(ctx interface{}, code interface{}, keywords interface{}) *mockICQUserFinder_FindByICQInterests_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQInterests(ctx any, code any, keywords any) *mockICQUserFinder_FindByICQInterests_Call {
 	return &mockICQUserFinder_FindByICQInterests_Call{Call: _e.mock.On("FindByICQInterests", ctx, code, keywords)}
 }
 
@@ -214,7 +223,7 @@ type mockICQUserFinder_FindByICQKeyword_Call struct {
 // FindByICQKeyword is a helper method to define mock.On call
 //   - ctx context.Context
 //   - keyword string
-func (_e *mockICQUserFinder_Expecter) FindByICQKeyword(ctx interface{}, keyword interface{}) *mockICQUserFinder_FindByICQKeyword_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQKeyword(ctx any, keyword any) *mockICQUserFinder_FindByICQKeyword_Call {
 	return &mockICQUserFinder_FindByICQKeyword_Call{Call: _e.mock.On("FindByICQKeyword", ctx, keyword)}
 }
 
@@ -284,7 +293,7 @@ type mockICQUserFinder_FindByICQName_Call struct {
 //   - firstName string
 //   - lastName string
 //   - nickName string
-func (_e *mockICQUserFinder_Expecter) FindByICQName(ctx interface{}, firstName interface{}, lastName interface{}, nickName interface{}) *mockICQUserFinder_FindByICQName_Call {
+func (_e *mockICQUserFinder_Expecter) FindByICQName(ctx any, firstName any, lastName any, nickName any) *mockICQUserFinder_FindByICQName_Call {
 	return &mockICQUserFinder_FindByICQName_Call{Call: _e.mock.On("FindByICQName", ctx, firstName, lastName, nickName)}
 }
 
@@ -360,7 +369,7 @@ type mockICQUserFinder_FindByUIN_Call struct {
 // FindByUIN is a helper method to define mock.On call
 //   - ctx context.Context
 //   - UIN uint32
-func (_e *mockICQUserFinder_Expecter) FindByUIN(ctx interface{}, UIN interface{}) *mockICQUserFinder_FindByUIN_Call {
+func (_e *mockICQUserFinder_Expecter) FindByUIN(ctx any, UIN any) *mockICQUserFinder_FindByUIN_Call {
 	return &mockICQUserFinder_FindByUIN_Call{Call: _e.mock.On("FindByUIN", ctx, UIN)}
 }
 
@@ -428,7 +437,7 @@ type mockICQUserFinder_SearchICQUsers_Call struct {
 // SearchICQUsers is a helper method to define mock.On call
 //   - ctx context.Context
 //   - c state.ICQUserSearchCriteria
-func (_e *mockICQUserFinder_Expecter) SearchICQUsers(ctx interface{}, c interface{}) *mockICQUserFinder_SearchICQUsers_Call {
+func (_e *mockICQUserFinder_Expecter) SearchICQUsers(ctx any, c any) *mockICQUserFinder_SearchICQUsers_Call {
 	return &mockICQUserFinder_SearchICQUsers_Call{Call: _e.mock.On("SearchICQUsers", ctx, c)}
 }
 

server/icq_legacy/mock_icq_user_updater_test.go

@@ -17,10 +17,19 @@ func newMockICQUserUpdater(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICQUserUpdater {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICQUserUpdater{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -64,7 +73,7 @@ type mockICQUserUpdater_SetAffiliations_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQAffiliations
-func (_e *mockICQUserUpdater_Expecter) SetAffiliations(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetAffiliations_Call {
+func (_e *mockICQUserUpdater_Expecter) SetAffiliations(ctx any, name any, data any) *mockICQUserUpdater_SetAffiliations_Call {
 	return &mockICQUserUpdater_SetAffiliations_Call{Call: _e.mock.On("SetAffiliations", ctx, name, data)}
 }
 
@@ -127,7 +136,7 @@ type mockICQUserUpdater_SetBasicInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQBasicInfo
-func (_e *mockICQUserUpdater_Expecter) SetBasicInfo(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetBasicInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetBasicInfo(ctx any, name any, data any) *mockICQUserUpdater_SetBasicInfo_Call {
 	return &mockICQUserUpdater_SetBasicInfo_Call{Call: _e.mock.On("SetBasicInfo", ctx, name, data)}
 }
 
@@ -190,7 +199,7 @@ type mockICQUserUpdater_SetHomepageCategory_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQHomepageCategory
-func (_e *mockICQUserUpdater_Expecter) SetHomepageCategory(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetHomepageCategory_Call {
+func (_e *mockICQUserUpdater_Expecter) SetHomepageCategory(ctx any, name any, data any) *mockICQUserUpdater_SetHomepageCategory_Call {
 	return &mockICQUserUpdater_SetHomepageCategory_Call{Call: _e.mock.On("SetHomepageCategory", ctx, name, data)}
 }
 
@@ -253,7 +262,7 @@ type mockICQUserUpdater_SetICQInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - info state.ICQInfo
-func (_e *mockICQUserUpdater_Expecter) SetICQInfo(ctx interface{}, name interface{}, info interface{}) *mockICQUserUpdater_SetICQInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetICQInfo(ctx any, name any, info any) *mockICQUserUpdater_SetICQInfo_Call {
 	return &mockICQUserUpdater_SetICQInfo_Call{Call: _e.mock.On("SetICQInfo", ctx, name, info)}
 }
 
@@ -316,7 +325,7 @@ type mockICQUserUpdater_SetInterests_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQInterests
-func (_e *mockICQUserUpdater_Expecter) SetInterests(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetInterests_Call {
+func (_e *mockICQUserUpdater_Expecter) SetInterests(ctx any, name any, data any) *mockICQUserUpdater_SetInterests_Call {
 	return &mockICQUserUpdater_SetInterests_Call{Call: _e.mock.On("SetInterests", ctx, name, data)}
 }
 
@@ -379,7 +388,7 @@ type mockICQUserUpdater_SetMoreInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQMoreInfo
-func (_e *mockICQUserUpdater_Expecter) SetMoreInfo(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetMoreInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetMoreInfo(ctx any, name any, data any) *mockICQUserUpdater_SetMoreInfo_Call {
 	return &mockICQUserUpdater_SetMoreInfo_Call{Call: _e.mock.On("SetMoreInfo", ctx, name, data)}
 }
 
@@ -442,7 +451,7 @@ type mockICQUserUpdater_SetPermissions_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQPermissions
-func (_e *mockICQUserUpdater_Expecter) SetPermissions(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetPermissions_Call {
+func (_e *mockICQUserUpdater_Expecter) SetPermissions(ctx any, name any, data any) *mockICQUserUpdater_SetPermissions_Call {
 	return &mockICQUserUpdater_SetPermissions_Call{Call: _e.mock.On("SetPermissions", ctx, name, data)}
 }
 
@@ -505,7 +514,7 @@ type mockICQUserUpdater_SetUserNotes_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQUserNotes
-func (_e *mockICQUserUpdater_Expecter) SetUserNotes(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetUserNotes_Call {
+func (_e *mockICQUserUpdater_Expecter) SetUserNotes(ctx any, name any, data any) *mockICQUserUpdater_SetUserNotes_Call {
 	return &mockICQUserUpdater_SetUserNotes_Call{Call: _e.mock.On("SetUserNotes", ctx, name, data)}
 }
 
@@ -568,7 +577,7 @@ type mockICQUserUpdater_SetWorkInfo_Call struct {
 //   - ctx context.Context
 //   - name state.IdentScreenName
 //   - data state.ICQWorkInfo
-func (_e *mockICQUserUpdater_Expecter) SetWorkInfo(ctx interface{}, name interface{}, data interface{}) *mockICQUserUpdater_SetWorkInfo_Call {
+func (_e *mockICQUserUpdater_Expecter) SetWorkInfo(ctx any, name any, data any) *mockICQUserUpdater_SetWorkInfo_Call {
 	return &mockICQUserUpdater_SetWorkInfo_Call{Call: _e.mock.On("SetWorkInfo", ctx, name, data)}
 }
 

server/icq_legacy/mock_legacy_service_test.go

@@ -17,10 +17,19 @@ func newMockLegacyService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockLegacyService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockLegacyService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -63,7 +72,7 @@ type mockLegacyService_AckOfflineMessages_Call struct {
 // AckOfflineMessages is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) AckOfflineMessages(ctx interface{}, uin interface{}) *mockLegacyService_AckOfflineMessages_Call {
+func (_e *mockLegacyService_Expecter) AckOfflineMessages(ctx any, uin any) *mockLegacyService_AckOfflineMessages_Call {
 	return &mockLegacyService_AckOfflineMessages_Call{Call: _e.mock.On("AckOfflineMessages", ctx, uin)}
 }
 
@@ -131,7 +140,7 @@ type mockLegacyService_AuthenticateUser_Call struct {
 // AuthenticateUser is a helper method to define mock.On call
 //   - ctx context.Context
 //   - req AuthRequest
-func (_e *mockLegacyService_Expecter) AuthenticateUser(ctx interface{}, req interface{}) *mockLegacyService_AuthenticateUser_Call {
+func (_e *mockLegacyService_Expecter) AuthenticateUser(ctx any, req any) *mockLegacyService_AuthenticateUser_Call {
 	return &mockLegacyService_AuthenticateUser_Call{Call: _e.mock.On("AuthenticateUser", ctx, req)}
 }
 
@@ -189,7 +198,7 @@ type mockLegacyService_ChangeStatus_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - status uint32
-func (_e *mockLegacyService_Expecter) ChangeStatus(ctx interface{}, uin interface{}, status interface{}) *mockLegacyService_ChangeStatus_Call {
+func (_e *mockLegacyService_Expecter) ChangeStatus(ctx any, uin any, status any) *mockLegacyService_ChangeStatus_Call {
 	return &mockLegacyService_ChangeStatus_Call{Call: _e.mock.On("ChangeStatus", ctx, uin, status)}
 }
 
@@ -252,7 +261,7 @@ type mockLegacyService_DeleteUser_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - password string
-func (_e *mockLegacyService_Expecter) DeleteUser(ctx interface{}, uin interface{}, password interface{}) *mockLegacyService_DeleteUser_Call {
+func (_e *mockLegacyService_Expecter) DeleteUser(ctx any, uin any, password any) *mockLegacyService_DeleteUser_Call {
 	return &mockLegacyService_DeleteUser_Call{Call: _e.mock.On("DeleteUser", ctx, uin, password)}
 }
 
@@ -325,7 +334,7 @@ type mockLegacyService_GetAffiliations_Call struct {
 // GetAffiliations is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) GetAffiliations(ctx interface{}, uin interface{}) *mockLegacyService_GetAffiliations_Call {
+func (_e *mockLegacyService_Expecter) GetAffiliations(ctx any, uin any) *mockLegacyService_GetAffiliations_Call {
 	return &mockLegacyService_GetAffiliations_Call{Call: _e.mock.On("GetAffiliations", ctx, uin)}
 }
 
@@ -393,7 +402,7 @@ type mockLegacyService_GetFullUserInfo_Call struct {
 // GetFullUserInfo is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) GetFullUserInfo(ctx interface{}, uin interface{}) *mockLegacyService_GetFullUserInfo_Call {
+func (_e *mockLegacyService_Expecter) GetFullUserInfo(ctx any, uin any) *mockLegacyService_GetFullUserInfo_Call {
 	return &mockLegacyService_GetFullUserInfo_Call{Call: _e.mock.On("GetFullUserInfo", ctx, uin)}
 }
 
@@ -461,7 +470,7 @@ type mockLegacyService_GetHomepageCategory_Call struct {
 // GetHomepageCategory is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) GetHomepageCategory(ctx interface{}, uin interface{}) *mockLegacyService_GetHomepageCategory_Call {
+func (_e *mockLegacyService_Expecter) GetHomepageCategory(ctx any, uin any) *mockLegacyService_GetHomepageCategory_Call {
 	return &mockLegacyService_GetHomepageCategory_Call{Call: _e.mock.On("GetHomepageCategory", ctx, uin)}
 }
 
@@ -529,7 +538,7 @@ type mockLegacyService_GetInterests_Call struct {
 // GetInterests is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) GetInterests(ctx interface{}, uin interface{}) *mockLegacyService_GetInterests_Call {
+func (_e *mockLegacyService_Expecter) GetInterests(ctx any, uin any) *mockLegacyService_GetInterests_Call {
 	return &mockLegacyService_GetInterests_Call{Call: _e.mock.On("GetInterests", ctx, uin)}
 }
 
@@ -595,7 +604,7 @@ type mockLegacyService_GetNotes_Call struct {
 // GetNotes is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) GetNotes(ctx interface{}, uin interface{}) *mockLegacyService_GetNotes_Call {
+func (_e *mockLegacyService_Expecter) GetNotes(ctx any, uin any) *mockLegacyService_GetNotes_Call {
 	return &mockLegacyService_GetNotes_Call{Call: _e.mock.On("GetNotes", ctx, uin)}
 }
 
@@ -663,7 +672,7 @@ type mockLegacyService_GetOfflineMessages_Call struct {
 // GetOfflineMessages is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) GetOfflineMessages(ctx interface{}, uin interface{}) *mockLegacyService_GetOfflineMessages_Call {
+func (_e *mockLegacyService_Expecter) GetOfflineMessages(ctx any, uin any) *mockLegacyService_GetOfflineMessages_Call {
 	return &mockLegacyService_GetOfflineMessages_Call{Call: _e.mock.On("GetOfflineMessages", ctx, uin)}
 }
 
@@ -731,7 +740,7 @@ type mockLegacyService_GetUserInfo_Call struct {
 // GetUserInfo is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) GetUserInfo(ctx interface{}, uin interface{}) *mockLegacyService_GetUserInfo_Call {
+func (_e *mockLegacyService_Expecter) GetUserInfo(ctx any, uin any) *mockLegacyService_GetUserInfo_Call {
 	return &mockLegacyService_GetUserInfo_Call{Call: _e.mock.On("GetUserInfo", ctx, uin)}
 }
 
@@ -799,7 +808,7 @@ type mockLegacyService_GetUserInfoForProtocol_Call struct {
 // GetUserInfoForProtocol is a helper method to define mock.On call
 //   - ctx context.Context
 //   - targetUIN uint32
-func (_e *mockLegacyService_Expecter) GetUserInfoForProtocol(ctx interface{}, targetUIN interface{}) *mockLegacyService_GetUserInfoForProtocol_Call {
+func (_e *mockLegacyService_Expecter) GetUserInfoForProtocol(ctx any, targetUIN any) *mockLegacyService_GetUserInfoForProtocol_Call {
 	return &mockLegacyService_GetUserInfoForProtocol_Call{Call: _e.mock.On("GetUserInfoForProtocol", ctx, targetUIN)}
 }
 
@@ -857,7 +866,7 @@ type mockLegacyService_NotifyStatusChange_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - status uint32
-func (_e *mockLegacyService_Expecter) NotifyStatusChange(ctx interface{}, uin interface{}, status interface{}) *mockLegacyService_NotifyStatusChange_Call {
+func (_e *mockLegacyService_Expecter) NotifyStatusChange(ctx any, uin any, status any) *mockLegacyService_NotifyStatusChange_Call {
 	return &mockLegacyService_NotifyStatusChange_Call{Call: _e.mock.On("NotifyStatusChange", ctx, uin, status)}
 }
 
@@ -919,7 +928,7 @@ type mockLegacyService_NotifyUserOffline_Call struct {
 // NotifyUserOffline is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) NotifyUserOffline(ctx interface{}, uin interface{}) *mockLegacyService_NotifyUserOffline_Call {
+func (_e *mockLegacyService_Expecter) NotifyUserOffline(ctx any, uin any) *mockLegacyService_NotifyUserOffline_Call {
 	return &mockLegacyService_NotifyUserOffline_Call{Call: _e.mock.On("NotifyUserOffline", ctx, uin)}
 }
 
@@ -977,7 +986,7 @@ type mockLegacyService_NotifyUserOnline_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - status uint32
-func (_e *mockLegacyService_Expecter) NotifyUserOnline(ctx interface{}, uin interface{}, status interface{}) *mockLegacyService_NotifyUserOnline_Call {
+func (_e *mockLegacyService_Expecter) NotifyUserOnline(ctx any, uin any, status any) *mockLegacyService_NotifyUserOnline_Call {
 	return &mockLegacyService_NotifyUserOnline_Call{Call: _e.mock.On("NotifyUserOnline", ctx, uin, status)}
 }
 
@@ -1051,7 +1060,7 @@ type mockLegacyService_ProcessContactList_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - req ContactListRequest
-func (_e *mockLegacyService_Expecter) ProcessContactList(ctx interface{}, instance interface{}, req interface{}) *mockLegacyService_ProcessContactList_Call {
+func (_e *mockLegacyService_Expecter) ProcessContactList(ctx any, instance any, req any) *mockLegacyService_ProcessContactList_Call {
 	return &mockLegacyService_ProcessContactList_Call{Call: _e.mock.On("ProcessContactList", ctx, instance, req)}
 }
 
@@ -1125,7 +1134,7 @@ type mockLegacyService_ProcessMessage_Call struct {
 //   - ctx context.Context
 //   - session *LegacySession
 //   - req MessageRequest
-func (_e *mockLegacyService_Expecter) ProcessMessage(ctx interface{}, session interface{}, req interface{}) *mockLegacyService_ProcessMessage_Call {
+func (_e *mockLegacyService_Expecter) ProcessMessage(ctx any, session any, req any) *mockLegacyService_ProcessMessage_Call {
 	return &mockLegacyService_ProcessMessage_Call{Call: _e.mock.On("ProcessMessage", ctx, session, req)}
 }
 
@@ -1198,7 +1207,7 @@ type mockLegacyService_ProcessStatusChange_Call struct {
 // ProcessStatusChange is a helper method to define mock.On call
 //   - ctx context.Context
 //   - req StatusChangeRequest
-func (_e *mockLegacyService_Expecter) ProcessStatusChange(ctx interface{}, req interface{}) *mockLegacyService_ProcessStatusChange_Call {
+func (_e *mockLegacyService_Expecter) ProcessStatusChange(ctx any, req any) *mockLegacyService_ProcessStatusChange_Call {
 	return &mockLegacyService_ProcessStatusChange_Call{Call: _e.mock.On("ProcessStatusChange", ctx, req)}
 }
 
@@ -1267,7 +1276,7 @@ type mockLegacyService_ProcessUserAdd_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - req UserAddRequest
-func (_e *mockLegacyService_Expecter) ProcessUserAdd(ctx interface{}, instance interface{}, req interface{}) *mockLegacyService_ProcessUserAdd_Call {
+func (_e *mockLegacyService_Expecter) ProcessUserAdd(ctx any, instance any, req any) *mockLegacyService_ProcessUserAdd_Call {
 	return &mockLegacyService_ProcessUserAdd_Call{Call: _e.mock.On("ProcessUserAdd", ctx, instance, req)}
 }
 
@@ -1342,7 +1351,7 @@ type mockLegacyService_RegisterNewUser_Call struct {
 //   - lastName string
 //   - email string
 //   - password string
-func (_e *mockLegacyService_Expecter) RegisterNewUser(ctx interface{}, nickname interface{}, firstName interface{}, lastName interface{}, email interface{}, password interface{}) *mockLegacyService_RegisterNewUser_Call {
+func (_e *mockLegacyService_Expecter) RegisterNewUser(ctx any, nickname any, firstName any, lastName any, email any, password any) *mockLegacyService_RegisterNewUser_Call {
 	return &mockLegacyService_RegisterNewUser_Call{Call: _e.mock.On("RegisterNewUser", ctx, nickname, firstName, lastName, email, password)}
 }
 
@@ -1433,7 +1442,7 @@ type mockLegacyService_SearchByName_Call struct {
 //   - first string
 //   - last string
 //   - email string
-func (_e *mockLegacyService_Expecter) SearchByName(ctx interface{}, nick interface{}, first interface{}, last interface{}, email interface{}) *mockLegacyService_SearchByName_Call {
+func (_e *mockLegacyService_Expecter) SearchByName(ctx any, nick any, first any, last any, email any) *mockLegacyService_SearchByName_Call {
 	return &mockLegacyService_SearchByName_Call{Call: _e.mock.On("SearchByName", ctx, nick, first, last, email)}
 }
 
@@ -1516,7 +1525,7 @@ type mockLegacyService_SearchByUIN_Call struct {
 // SearchByUIN is a helper method to define mock.On call
 //   - ctx context.Context
 //   - uin uint32
-func (_e *mockLegacyService_Expecter) SearchByUIN(ctx interface{}, uin interface{}) *mockLegacyService_SearchByUIN_Call {
+func (_e *mockLegacyService_Expecter) SearchByUIN(ctx any, uin any) *mockLegacyService_SearchByUIN_Call {
 	return &mockLegacyService_SearchByUIN_Call{Call: _e.mock.On("SearchByUIN", ctx, uin)}
 }
 
@@ -1574,7 +1583,7 @@ type mockLegacyService_SetAffiliations_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - affiliations state.ICQAffiliations
-func (_e *mockLegacyService_Expecter) SetAffiliations(ctx interface{}, uin interface{}, affiliations interface{}) *mockLegacyService_SetAffiliations_Call {
+func (_e *mockLegacyService_Expecter) SetAffiliations(ctx any, uin any, affiliations any) *mockLegacyService_SetAffiliations_Call {
 	return &mockLegacyService_SetAffiliations_Call{Call: _e.mock.On("SetAffiliations", ctx, uin, affiliations)}
 }
 
@@ -1637,7 +1646,7 @@ type mockLegacyService_SetAuthMode_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - authRequired bool
-func (_e *mockLegacyService_Expecter) SetAuthMode(ctx interface{}, uin interface{}, authRequired interface{}) *mockLegacyService_SetAuthMode_Call {
+func (_e *mockLegacyService_Expecter) SetAuthMode(ctx any, uin any, authRequired any) *mockLegacyService_SetAuthMode_Call {
 	return &mockLegacyService_SetAuthMode_Call{Call: _e.mock.On("SetAuthMode", ctx, uin, authRequired)}
 }
 
@@ -1700,7 +1709,7 @@ type mockLegacyService_SetHomepageCategory_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - hpcat state.ICQHomepageCategory
-func (_e *mockLegacyService_Expecter) SetHomepageCategory(ctx interface{}, uin interface{}, hpcat interface{}) *mockLegacyService_SetHomepageCategory_Call {
+func (_e *mockLegacyService_Expecter) SetHomepageCategory(ctx any, uin any, hpcat any) *mockLegacyService_SetHomepageCategory_Call {
 	return &mockLegacyService_SetHomepageCategory_Call{Call: _e.mock.On("SetHomepageCategory", ctx, uin, hpcat)}
 }
 
@@ -1763,7 +1772,7 @@ type mockLegacyService_SetInterests_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - interests state.ICQInterests
-func (_e *mockLegacyService_Expecter) SetInterests(ctx interface{}, uin interface{}, interests interface{}) *mockLegacyService_SetInterests_Call {
+func (_e *mockLegacyService_Expecter) SetInterests(ctx any, uin any, interests any) *mockLegacyService_SetInterests_Call {
 	return &mockLegacyService_SetInterests_Call{Call: _e.mock.On("SetInterests", ctx, uin, interests)}
 }
 
@@ -1826,7 +1835,7 @@ type mockLegacyService_SetNotes_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - notes string
-func (_e *mockLegacyService_Expecter) SetNotes(ctx interface{}, uin interface{}, notes interface{}) *mockLegacyService_SetNotes_Call {
+func (_e *mockLegacyService_Expecter) SetNotes(ctx any, uin any, notes any) *mockLegacyService_SetNotes_Call {
 	return &mockLegacyService_SetNotes_Call{Call: _e.mock.On("SetNotes", ctx, uin, notes)}
 }
 
@@ -1890,7 +1899,7 @@ type mockLegacyService_SetPassword_Call struct {
 //   - uin uint32
 //   - oldPassword string
 //   - newPassword string
-func (_e *mockLegacyService_Expecter) SetPassword(ctx interface{}, uin interface{}, oldPassword interface{}, newPassword interface{}) *mockLegacyService_SetPassword_Call {
+func (_e *mockLegacyService_Expecter) SetPassword(ctx any, uin any, oldPassword any, newPassword any) *mockLegacyService_SetPassword_Call {
 	return &mockLegacyService_SetPassword_Call{Call: _e.mock.On("SetPassword", ctx, uin, oldPassword, newPassword)}
 }
 
@@ -1958,7 +1967,7 @@ type mockLegacyService_UpdateBasicInfo_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - info state.ICQBasicInfo
-func (_e *mockLegacyService_Expecter) UpdateBasicInfo(ctx interface{}, uin interface{}, info interface{}) *mockLegacyService_UpdateBasicInfo_Call {
+func (_e *mockLegacyService_Expecter) UpdateBasicInfo(ctx any, uin any, info any) *mockLegacyService_UpdateBasicInfo_Call {
 	return &mockLegacyService_UpdateBasicInfo_Call{Call: _e.mock.On("UpdateBasicInfo", ctx, uin, info)}
 }
 
@@ -2021,7 +2030,7 @@ type mockLegacyService_UpdateMoreInfo_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - info state.ICQMoreInfo
-func (_e *mockLegacyService_Expecter) UpdateMoreInfo(ctx interface{}, uin interface{}, info interface{}) *mockLegacyService_UpdateMoreInfo_Call {
+func (_e *mockLegacyService_Expecter) UpdateMoreInfo(ctx any, uin any, info any) *mockLegacyService_UpdateMoreInfo_Call {
 	return &mockLegacyService_UpdateMoreInfo_Call{Call: _e.mock.On("UpdateMoreInfo", ctx, uin, info)}
 }
 
@@ -2084,7 +2093,7 @@ type mockLegacyService_UpdatePermissions_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - info state.ICQPermissions
-func (_e *mockLegacyService_Expecter) UpdatePermissions(ctx interface{}, uin interface{}, info interface{}) *mockLegacyService_UpdatePermissions_Call {
+func (_e *mockLegacyService_Expecter) UpdatePermissions(ctx any, uin any, info any) *mockLegacyService_UpdatePermissions_Call {
 	return &mockLegacyService_UpdatePermissions_Call{Call: _e.mock.On("UpdatePermissions", ctx, uin, info)}
 }
 
@@ -2147,7 +2156,7 @@ type mockLegacyService_UpdateWorkInfo_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - info state.ICQWorkInfo
-func (_e *mockLegacyService_Expecter) UpdateWorkInfo(ctx interface{}, uin interface{}, info interface{}) *mockLegacyService_UpdateWorkInfo_Call {
+func (_e *mockLegacyService_Expecter) UpdateWorkInfo(ctx any, uin any, info any) *mockLegacyService_UpdateWorkInfo_Call {
 	return &mockLegacyService_UpdateWorkInfo_Call{Call: _e.mock.On("UpdateWorkInfo", ctx, uin, info)}
 }
 
@@ -2219,7 +2228,7 @@ type mockLegacyService_ValidateCredentials_Call struct {
 //   - ctx context.Context
 //   - uin uint32
 //   - password string
-func (_e *mockLegacyService_Expecter) ValidateCredentials(ctx interface{}, uin interface{}, password interface{}) *mockLegacyService_ValidateCredentials_Call {
+func (_e *mockLegacyService_Expecter) ValidateCredentials(ctx any, uin any, password any) *mockLegacyService_ValidateCredentials_Call {
 	return &mockLegacyService_ValidateCredentials_Call{Call: _e.mock.On("ValidateCredentials", ctx, uin, password)}
 }
 
@@ -2292,7 +2301,7 @@ type mockLegacyService_WhitePagesSearch_Call struct {
 // WhitePagesSearch is a helper method to define mock.On call
 //   - ctx context.Context
 //   - criteria WhitePagesSearchCriteria
-func (_e *mockLegacyService_Expecter) WhitePagesSearch(ctx interface{}, criteria interface{}) *mockLegacyService_WhitePagesSearch_Call {
+func (_e *mockLegacyService_Expecter) WhitePagesSearch(ctx any, criteria any) *mockLegacyService_WhitePagesSearch_Call {
 	return &mockLegacyService_WhitePagesSearch_Call{Call: _e.mock.On("WhitePagesSearch", ctx, criteria)}
 }
 

server/icq_legacy/mock_message_dispatcher_test.go

@@ -14,10 +14,19 @@ func newMockMessageDispatcher(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockMessageDispatcher {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockMessageDispatcher{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -62,7 +71,7 @@ type mockMessageDispatcher_SendOnlineMessage_Call struct {
 //   - fromUIN uint32
 //   - msgType uint16
 //   - message string
-func (_e *mockMessageDispatcher_Expecter) SendOnlineMessage(toSession interface{}, fromUIN interface{}, msgType interface{}, message interface{}) *mockMessageDispatcher_SendOnlineMessage_Call {
+func (_e *mockMessageDispatcher_Expecter) SendOnlineMessage(toSession any, fromUIN any, msgType any, message any) *mockMessageDispatcher_SendOnlineMessage_Call {
 	return &mockMessageDispatcher_SendOnlineMessage_Call{Call: _e.mock.On("SendOnlineMessage", toSession, fromUIN, msgType, message)}
 }
 
@@ -130,7 +139,7 @@ type mockMessageDispatcher_SendStatusChange_Call struct {
 //   - toSession *LegacySession
 //   - changedUIN uint32
 //   - newStatus uint32
-func (_e *mockMessageDispatcher_Expecter) SendStatusChange(toSession interface{}, changedUIN interface{}, newStatus interface{}) *mockMessageDispatcher_SendStatusChange_Call {
+func (_e *mockMessageDispatcher_Expecter) SendStatusChange(toSession any, changedUIN any, newStatus any) *mockMessageDispatcher_SendStatusChange_Call {
 	return &mockMessageDispatcher_SendStatusChange_Call{Call: _e.mock.On("SendStatusChange", toSession, changedUIN, newStatus)}
 }
 
@@ -192,7 +201,7 @@ type mockMessageDispatcher_SendUserOffline_Call struct {
 // SendUserOffline is a helper method to define mock.On call
 //   - toSession *LegacySession
 //   - offlineUIN uint32
-func (_e *mockMessageDispatcher_Expecter) SendUserOffline(toSession interface{}, offlineUIN interface{}) *mockMessageDispatcher_SendUserOffline_Call {
+func (_e *mockMessageDispatcher_Expecter) SendUserOffline(toSession any, offlineUIN any) *mockMessageDispatcher_SendUserOffline_Call {
 	return &mockMessageDispatcher_SendUserOffline_Call{Call: _e.mock.On("SendUserOffline", toSession, offlineUIN)}
 }
 
@@ -250,7 +259,7 @@ type mockMessageDispatcher_SendUserOnline_Call struct {
 //   - toSession *LegacySession
 //   - onlineUIN uint32
 //   - status uint32
-func (_e *mockMessageDispatcher_Expecter) SendUserOnline(toSession interface{}, onlineUIN interface{}, status interface{}) *mockMessageDispatcher_SendUserOnline_Call {
+func (_e *mockMessageDispatcher_Expecter) SendUserOnline(toSession any, onlineUIN any, status any) *mockMessageDispatcher_SendUserOnline_Call {
 	return &mockMessageDispatcher_SendUserOnline_Call{Call: _e.mock.On("SendUserOnline", toSession, onlineUIN, status)}
 }
 

server/icq_legacy/mock_message_relayer_test.go

@@ -18,10 +18,19 @@ func newMockMessageRelayer(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockMessageRelayer {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockMessageRelayer{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -54,7 +63,7 @@ type mockMessageRelayer_RelayToScreenName_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - msg wire.SNACMessage
-func (_e *mockMessageRelayer_Expecter) RelayToScreenName(ctx interface{}, screenName interface{}, msg interface{}) *mockMessageRelayer_RelayToScreenName_Call {
+func (_e *mockMessageRelayer_Expecter) RelayToScreenName(ctx any, screenName any, msg any) *mockMessageRelayer_RelayToScreenName_Call {
 	return &mockMessageRelayer_RelayToScreenName_Call{Call: _e.mock.On("RelayToScreenName", ctx, screenName, msg)}
 }
 

server/icq_legacy/mock_offline_message_manager_test.go

@@ -17,10 +17,19 @@ func newMockOfflineMessageManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockOfflineMessageManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockOfflineMessageManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -63,7 +72,7 @@ type mockOfflineMessageManager_DeleteMessages_Call struct {
 // DeleteMessages is a helper method to define mock.On call
 //   - ctx context.Context
 //   - recip state.IdentScreenName
-func (_e *mockOfflineMessageManager_Expecter) DeleteMessages(ctx interface{}, recip interface{}) *mockOfflineMessageManager_DeleteMessages_Call {
+func (_e *mockOfflineMessageManager_Expecter) DeleteMessages(ctx any, recip any) *mockOfflineMessageManager_DeleteMessages_Call {
 	return &mockOfflineMessageManager_DeleteMessages_Call{Call: _e.mock.On("DeleteMessages", ctx, recip)}
 }
 
@@ -131,7 +140,7 @@ type mockOfflineMessageManager_RetrieveMessages_Call struct {
 // RetrieveMessages is a helper method to define mock.On call
 //   - ctx context.Context
 //   - recip state.IdentScreenName
-func (_e *mockOfflineMessageManager_Expecter) RetrieveMessages(ctx interface{}, recip interface{}) *mockOfflineMessageManager_RetrieveMessages_Call {
+func (_e *mockOfflineMessageManager_Expecter) RetrieveMessages(ctx any, recip any) *mockOfflineMessageManager_RetrieveMessages_Call {
 	return &mockOfflineMessageManager_RetrieveMessages_Call{Call: _e.mock.On("RetrieveMessages", ctx, recip)}
 }
 
@@ -197,7 +206,7 @@ type mockOfflineMessageManager_SaveMessage_Call struct {
 // SaveMessage is a helper method to define mock.On call
 //   - ctx context.Context
 //   - offlineMessage state.OfflineMessage
-func (_e *mockOfflineMessageManager_Expecter) SaveMessage(ctx interface{}, offlineMessage interface{}) *mockOfflineMessageManager_SaveMessage_Call {
+func (_e *mockOfflineMessageManager_Expecter) SaveMessage(ctx any, offlineMessage any) *mockOfflineMessageManager_SaveMessage_Call {
 	return &mockOfflineMessageManager_SaveMessage_Call{Call: _e.mock.On("SaveMessage", ctx, offlineMessage)}
 }
 

server/icq_legacy/mock_packet_sender_test.go

@@ -16,10 +16,19 @@ func newMockPacketSender(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockPacketSender {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockPacketSender{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -62,7 +71,7 @@ type mockPacketSender_SendPacket_Call struct {
 // SendPacket is a helper method to define mock.On call
 //   - addr *net.UDPAddr
 //   - packet []byte
-func (_e *mockPacketSender_Expecter) SendPacket(addr interface{}, packet interface{}) *mockPacketSender_SendPacket_Call {
+func (_e *mockPacketSender_Expecter) SendPacket(addr any, packet any) *mockPacketSender_SendPacket_Call {
 	return &mockPacketSender_SendPacket_Call{Call: _e.mock.On("SendPacket", addr, packet)}
 }
 
@@ -119,7 +128,7 @@ type mockPacketSender_SendToSession_Call struct {
 // SendToSession is a helper method to define mock.On call
 //   - session *LegacySession
 //   - packet []byte
-func (_e *mockPacketSender_Expecter) SendToSession(session interface{}, packet interface{}) *mockPacketSender_SendToSession_Call {
+func (_e *mockPacketSender_Expecter) SendToSession(session any, packet any) *mockPacketSender_SendToSession_Call {
 	return &mockPacketSender_SendToSession_Call{Call: _e.mock.On("SendToSession", session, packet)}
 }
 

server/icq_legacy/mock_relationship_fetcher_test.go

@@ -17,10 +17,19 @@ func newMockRelationshipFetcher(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockRelationshipFetcher {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockRelationshipFetcher{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockRelationshipFetcher_AllRelationships_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - filter []state.IdentScreenName
-func (_e *mockRelationshipFetcher_Expecter) AllRelationships(ctx interface{}, me interface{}, filter interface{}) *mockRelationshipFetcher_AllRelationships_Call {
+func (_e *mockRelationshipFetcher_Expecter) AllRelationships(ctx any, me any, filter any) *mockRelationshipFetcher_AllRelationships_Call {
 	return &mockRelationshipFetcher_AllRelationships_Call{Call: _e.mock.On("AllRelationships", ctx, me, filter)}
 }
 
@@ -147,7 +156,7 @@ type mockRelationshipFetcher_Relationship_Call struct {
 //   - ctx context.Context
 //   - me state.IdentScreenName
 //   - them state.IdentScreenName
-func (_e *mockRelationshipFetcher_Expecter) Relationship(ctx interface{}, me interface{}, them interface{}) *mockRelationshipFetcher_Relationship_Call {
+func (_e *mockRelationshipFetcher_Expecter) Relationship(ctx any, me any, them any) *mockRelationshipFetcher_Relationship_Call {
 	return &mockRelationshipFetcher_Relationship_Call{Call: _e.mock.On("Relationship", ctx, me, them)}
 }
 

server/icq_legacy/mock_session_retriever_test.go

@@ -15,10 +15,19 @@ func newMockSessionRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockSessionRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockSessionRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -62,7 +71,7 @@ type mockSessionRetriever_RetrieveSession_Call struct {
 
 // RetrieveSession is a helper method to define mock.On call
 //   - screenName state.IdentScreenName
-func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName interface{}) *mockSessionRetriever_RetrieveSession_Call {
+func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName any) *mockSessionRetriever_RetrieveSession_Call {
 	return &mockSessionRetriever_RetrieveSession_Call{Call: _e.mock.On("RetrieveSession", screenName)}
 }
 

server/icq_legacy/mock_user_manager_test.go

@@ -17,10 +17,19 @@ func newMockUserManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockUserManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockUserManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -63,7 +72,7 @@ type mockUserManager_DeleteUser_Call struct {
 // DeleteUser is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockUserManager_Expecter) DeleteUser(ctx interface{}, screenName interface{}) *mockUserManager_DeleteUser_Call {
+func (_e *mockUserManager_Expecter) DeleteUser(ctx any, screenName any) *mockUserManager_DeleteUser_Call {
 	return &mockUserManager_DeleteUser_Call{Call: _e.mock.On("DeleteUser", ctx, screenName)}
 }
 
@@ -120,7 +129,7 @@ type mockUserManager_InsertUser_Call struct {
 // InsertUser is a helper method to define mock.On call
 //   - ctx context.Context
 //   - u state.User
-func (_e *mockUserManager_Expecter) InsertUser(ctx interface{}, u interface{}) *mockUserManager_InsertUser_Call {
+func (_e *mockUserManager_Expecter) InsertUser(ctx any, u any) *mockUserManager_InsertUser_Call {
 	return &mockUserManager_InsertUser_Call{Call: _e.mock.On("InsertUser", ctx, u)}
 }
 
@@ -188,7 +197,7 @@ type mockUserManager_User_Call struct {
 // User is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockUserManager_Expecter) User(ctx interface{}, screenName interface{}) *mockUserManager_User_Call {
+func (_e *mockUserManager_Expecter) User(ctx any, screenName any) *mockUserManager_User_Call {
 	return &mockUserManager_User_Call{Call: _e.mock.On("User", ctx, screenName)}
 }
 

server/oscar/mock_admin_service_test.go

@@ -18,10 +18,19 @@ func newMockAdminService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAdminService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAdminService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockAdminService_ConfirmRequest_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockAdminService_Expecter) ConfirmRequest(ctx interface{}, instance interface{}, inFrame interface{}) *mockAdminService_ConfirmRequest_Call {
+func (_e *mockAdminService_Expecter) ConfirmRequest(ctx any, instance any, inFrame any) *mockAdminService_ConfirmRequest_Call {
 	return &mockAdminService_ConfirmRequest_Call{Call: _e.mock.On("ConfirmRequest", ctx, instance, inFrame)}
 }
 
@@ -147,7 +156,7 @@ type mockAdminService_InfoChangeRequest_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x07_0x04_AdminInfoChangeRequest
-func (_e *mockAdminService_Expecter) InfoChangeRequest(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockAdminService_InfoChangeRequest_Call {
+func (_e *mockAdminService_Expecter) InfoChangeRequest(ctx any, instance any, inFrame any, inBody any) *mockAdminService_InfoChangeRequest_Call {
 	return &mockAdminService_InfoChangeRequest_Call{Call: _e.mock.On("InfoChangeRequest", ctx, instance, inFrame, inBody)}
 }
 
@@ -225,7 +234,7 @@ type mockAdminService_InfoQuery_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x07_0x02_AdminInfoQuery
-func (_e *mockAdminService_Expecter) InfoQuery(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockAdminService_InfoQuery_Call {
+func (_e *mockAdminService_Expecter) InfoQuery(ctx any, instance any, inFrame any, inBody any) *mockAdminService_InfoQuery_Call {
 	return &mockAdminService_InfoQuery_Call{Call: _e.mock.On("InfoQuery", ctx, instance, inFrame, inBody)}
 }
 

server/oscar/mock_auth_test.go

@@ -21,10 +21,19 @@ func newMockAuthService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAuthService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAuthService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockAuthService_BUCPChallenge_Call struct {
 //   - ctx context.Context
 //   - inBody wire.SNAC_0x17_0x06_BUCPChallengeRequest
 //   - newUUID func() uuid.UUID
-func (_e *mockAuthService_Expecter) BUCPChallenge(ctx interface{}, inBody interface{}, newUUID interface{}) *mockAuthService_BUCPChallenge_Call {
+func (_e *mockAuthService_Expecter) BUCPChallenge(ctx any, inBody any, newUUID any) *mockAuthService_BUCPChallenge_Call {
 	return &mockAuthService_BUCPChallenge_Call{Call: _e.mock.On("BUCPChallenge", ctx, inBody, newUUID)}
 }
 
@@ -149,7 +158,7 @@ type mockAuthService_BUCPLogin_Call struct {
 //   - ctx context.Context
 //   - inBody wire.SNAC_0x17_0x02_BUCPLoginRequest
 //   - endpointCfg config.Endpoint
-func (_e *mockAuthService_Expecter) BUCPLogin(ctx interface{}, inBody interface{}, endpointCfg interface{}) *mockAuthService_BUCPLogin_Call {
+func (_e *mockAuthService_Expecter) BUCPLogin(ctx any, inBody any, endpointCfg any) *mockAuthService_BUCPLogin_Call {
 	return &mockAuthService_BUCPLogin_Call{Call: _e.mock.On("BUCPLogin", ctx, inBody, endpointCfg)}
 }
 
@@ -225,7 +234,7 @@ type mockAuthService_CrackCookie_Call struct {
 
 // CrackCookie is a helper method to define mock.On call
 //   - authCookie []byte
-func (_e *mockAuthService_Expecter) CrackCookie(authCookie interface{}) *mockAuthService_CrackCookie_Call {
+func (_e *mockAuthService_Expecter) CrackCookie(authCookie any) *mockAuthService_CrackCookie_Call {
 	return &mockAuthService_CrackCookie_Call{Call: _e.mock.On("CrackCookie", authCookie)}
 }
 
@@ -287,7 +296,7 @@ type mockAuthService_FLAPLogin_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.FLAPSignonFrame
 //   - endpointCfg config.Endpoint
-func (_e *mockAuthService_Expecter) FLAPLogin(ctx interface{}, inFrame interface{}, endpointCfg interface{}) *mockAuthService_FLAPLogin_Call {
+func (_e *mockAuthService_Expecter) FLAPLogin(ctx any, inFrame any, endpointCfg any) *mockAuthService_FLAPLogin_Call {
 	return &mockAuthService_FLAPLogin_Call{Call: _e.mock.On("FLAPLogin", ctx, inFrame, endpointCfg)}
 }
 
@@ -359,7 +368,7 @@ type mockAuthService_KerberosLogin_Call struct {
 //   - ctx context.Context
 //   - inBody wire.SNAC_0x050C_0x0002_KerberosLoginRequest
 //   - endpointCfg config.Endpoint
-func (_e *mockAuthService_Expecter) KerberosLogin(ctx interface{}, inBody interface{}, endpointCfg interface{}) *mockAuthService_KerberosLogin_Call {
+func (_e *mockAuthService_Expecter) KerberosLogin(ctx any, inBody any, endpointCfg any) *mockAuthService_KerberosLogin_Call {
 	return &mockAuthService_KerberosLogin_Call{Call: _e.mock.On("KerberosLogin", ctx, inBody, endpointCfg)}
 }
 
@@ -433,7 +442,7 @@ type mockAuthService_RegisterBOSSession_Call struct {
 //   - ctx context.Context
 //   - authCookie state.ServerCookie
 //   - sessCfg func(sess *state.Session)
-func (_e *mockAuthService_Expecter) RegisterBOSSession(ctx interface{}, authCookie interface{}, sessCfg interface{}) *mockAuthService_RegisterBOSSession_Call {
+func (_e *mockAuthService_Expecter) RegisterBOSSession(ctx any, authCookie any, sessCfg any) *mockAuthService_RegisterBOSSession_Call {
 	return &mockAuthService_RegisterBOSSession_Call{Call: _e.mock.On("RegisterBOSSession", ctx, authCookie, sessCfg)}
 }
 
@@ -507,7 +516,7 @@ type mockAuthService_RegisterChatSession_Call struct {
 //   - ctx context.Context
 //   - authCookie state.ServerCookie
 //   - sessCfg func(sess *state.Session)
-func (_e *mockAuthService_Expecter) RegisterChatSession(ctx interface{}, authCookie interface{}, sessCfg interface{}) *mockAuthService_RegisterChatSession_Call {
+func (_e *mockAuthService_Expecter) RegisterChatSession(ctx any, authCookie any, sessCfg any) *mockAuthService_RegisterChatSession_Call {
 	return &mockAuthService_RegisterChatSession_Call{Call: _e.mock.On("RegisterChatSession", ctx, authCookie, sessCfg)}
 }
 
@@ -580,7 +589,7 @@ type mockAuthService_RetrieveBOSSession_Call struct {
 // RetrieveBOSSession is a helper method to define mock.On call
 //   - ctx context.Context
 //   - authCookie state.ServerCookie
-func (_e *mockAuthService_Expecter) RetrieveBOSSession(ctx interface{}, authCookie interface{}) *mockAuthService_RetrieveBOSSession_Call {
+func (_e *mockAuthService_Expecter) RetrieveBOSSession(ctx any, authCookie any) *mockAuthService_RetrieveBOSSession_Call {
 	return &mockAuthService_RetrieveBOSSession_Call{Call: _e.mock.On("RetrieveBOSSession", ctx, authCookie)}
 }
 
@@ -626,7 +635,7 @@ type mockAuthService_Signout_Call struct {
 // Signout is a helper method to define mock.On call
 //   - ctx context.Context
 //   - session *state.Session
-func (_e *mockAuthService_Expecter) Signout(ctx interface{}, session interface{}) *mockAuthService_Signout_Call {
+func (_e *mockAuthService_Expecter) Signout(ctx any, session any) *mockAuthService_Signout_Call {
 	return &mockAuthService_Signout_Call{Call: _e.mock.On("Signout", ctx, session)}
 }
 
@@ -672,7 +681,7 @@ type mockAuthService_SignoutChat_Call struct {
 // SignoutChat is a helper method to define mock.On call
 //   - ctx context.Context
 //   - instance *state.Session
-func (_e *mockAuthService_Expecter) SignoutChat(ctx interface{}, instance interface{}) *mockAuthService_SignoutChat_Call {
+func (_e *mockAuthService_Expecter) SignoutChat(ctx any, instance any) *mockAuthService_SignoutChat_Call {
 	return &mockAuthService_SignoutChat_Call{Call: _e.mock.On("SignoutChat", ctx, instance)}
 }
 

server/oscar/mock_bart_service_test.go

@@ -18,10 +18,19 @@ func newMockBARTService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBARTService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBARTService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockBARTService_RetrieveItem_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x10_0x04_BARTDownloadQuery
-func (_e *mockBARTService_Expecter) RetrieveItem(ctx interface{}, inFrame interface{}, inBody interface{}) *mockBARTService_RetrieveItem_Call {
+func (_e *mockBARTService_Expecter) RetrieveItem(ctx any, inFrame any, inBody any) *mockBARTService_RetrieveItem_Call {
 	return &mockBARTService_RetrieveItem_Call{Call: _e.mock.On("RetrieveItem", ctx, inFrame, inBody)}
 }
 
@@ -148,7 +157,7 @@ type mockBARTService_RetrieveItemV2_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x10_0x06_BARTDownload2Query
-func (_e *mockBARTService_Expecter) RetrieveItemV2(ctx interface{}, inFrame interface{}, inBody interface{}) *mockBARTService_RetrieveItemV2_Call {
+func (_e *mockBARTService_Expecter) RetrieveItemV2(ctx any, inFrame any, inBody any) *mockBARTService_RetrieveItemV2_Call {
 	return &mockBARTService_RetrieveItemV2_Call{Call: _e.mock.On("RetrieveItemV2", ctx, inFrame, inBody)}
 }
 
@@ -221,7 +230,7 @@ type mockBARTService_UpsertItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x10_0x02_BARTUploadQuery
-func (_e *mockBARTService_Expecter) UpsertItem(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockBARTService_UpsertItem_Call {
+func (_e *mockBARTService_Expecter) UpsertItem(ctx any, instance any, inFrame any, inBody any) *mockBARTService_UpsertItem_Call {
 	return &mockBARTService_UpsertItem_Call{Call: _e.mock.On("UpsertItem", ctx, instance, inFrame, inBody)}
 }
 

server/oscar/mock_buddy_list_registry_test.go

@@ -17,10 +17,19 @@ func newMockBuddyListRegistry(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyListRegistry {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyListRegistry{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -62,7 +71,7 @@ type mockBuddyListRegistry_ClearBuddyListRegistry_Call struct {
 
 // ClearBuddyListRegistry is a helper method to define mock.On call
 //   - ctx context.Context
-func (_e *mockBuddyListRegistry_Expecter) ClearBuddyListRegistry(ctx interface{}) *mockBuddyListRegistry_ClearBuddyListRegistry_Call {
+func (_e *mockBuddyListRegistry_Expecter) ClearBuddyListRegistry(ctx any) *mockBuddyListRegistry_ClearBuddyListRegistry_Call {
 	return &mockBuddyListRegistry_ClearBuddyListRegistry_Call{Call: _e.mock.On("ClearBuddyListRegistry", ctx)}
 }
 
@@ -114,7 +123,7 @@ type mockBuddyListRegistry_RegisterBuddyList_Call struct {
 // RegisterBuddyList is a helper method to define mock.On call
 //   - ctx context.Context
 //   - user state.IdentScreenName
-func (_e *mockBuddyListRegistry_Expecter) RegisterBuddyList(ctx interface{}, user interface{}) *mockBuddyListRegistry_RegisterBuddyList_Call {
+func (_e *mockBuddyListRegistry_Expecter) RegisterBuddyList(ctx any, user any) *mockBuddyListRegistry_RegisterBuddyList_Call {
 	return &mockBuddyListRegistry_RegisterBuddyList_Call{Call: _e.mock.On("RegisterBuddyList", ctx, user)}
 }
 
@@ -171,7 +180,7 @@ type mockBuddyListRegistry_UnregisterBuddyList_Call struct {
 // UnregisterBuddyList is a helper method to define mock.On call
 //   - ctx context.Context
 //   - user state.IdentScreenName
-func (_e *mockBuddyListRegistry_Expecter) UnregisterBuddyList(ctx interface{}, user interface{}) *mockBuddyListRegistry_UnregisterBuddyList_Call {
+func (_e *mockBuddyListRegistry_Expecter) UnregisterBuddyList(ctx any, user any) *mockBuddyListRegistry_UnregisterBuddyList_Call {
 	return &mockBuddyListRegistry_UnregisterBuddyList_Call{Call: _e.mock.On("UnregisterBuddyList", ctx, user)}
 }
 

server/oscar/mock_buddy_service_test.go

@@ -18,10 +18,19 @@ func newMockBuddyService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockBuddyService_AddBuddies_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x03_0x04_BuddyAddBuddies
-func (_e *mockBuddyService_Expecter) AddBuddies(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockBuddyService_AddBuddies_Call {
+func (_e *mockBuddyService_Expecter) AddBuddies(ctx any, instance any, inFrame any, inBody any) *mockBuddyService_AddBuddies_Call {
 	return &mockBuddyService_AddBuddies_Call{Call: _e.mock.On("AddBuddies", ctx, instance, inFrame, inBody)}
 }
 
@@ -157,7 +166,7 @@ type mockBuddyService_AddTempBuddies_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x03_0x0F_BuddyAddTempBuddies
-func (_e *mockBuddyService_Expecter) AddTempBuddies(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockBuddyService_AddTempBuddies_Call {
+func (_e *mockBuddyService_Expecter) AddTempBuddies(ctx any, instance any, inFrame any, inBody any) *mockBuddyService_AddTempBuddies_Call {
 	return &mockBuddyService_AddTempBuddies_Call{Call: _e.mock.On("AddTempBuddies", ctx, instance, inFrame, inBody)}
 }
 
@@ -225,7 +234,7 @@ type mockBuddyService_DelBuddies_Call struct {
 //   - context1 context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x03_0x05_BuddyDelBuddies
-func (_e *mockBuddyService_Expecter) DelBuddies(context1 interface{}, instance interface{}, inBody interface{}) *mockBuddyService_DelBuddies_Call {
+func (_e *mockBuddyService_Expecter) DelBuddies(context1 any, instance any, inBody any) *mockBuddyService_DelBuddies_Call {
 	return &mockBuddyService_DelBuddies_Call{Call: _e.mock.On("DelBuddies", context1, instance, inBody)}
 }
 
@@ -288,7 +297,7 @@ type mockBuddyService_DelTempBuddies_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x03_0x10_BuddyDelTempBuddies
-func (_e *mockBuddyService_Expecter) DelTempBuddies(ctx interface{}, instance interface{}, inBody interface{}) *mockBuddyService_DelTempBuddies_Call {
+func (_e *mockBuddyService_Expecter) DelTempBuddies(ctx any, instance any, inBody any) *mockBuddyService_DelTempBuddies_Call {
 	return &mockBuddyService_DelTempBuddies_Call{Call: _e.mock.On("DelTempBuddies", ctx, instance, inBody)}
 }
 
@@ -350,7 +359,7 @@ type mockBuddyService_RightsQuery_Call struct {
 // RightsQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockBuddyService_Expecter) RightsQuery(ctx interface{}, inFrame interface{}) *mockBuddyService_RightsQuery_Call {
+func (_e *mockBuddyService_Expecter) RightsQuery(ctx any, inFrame any) *mockBuddyService_RightsQuery_Call {
 	return &mockBuddyService_RightsQuery_Call{Call: _e.mock.On("RightsQuery", ctx, inFrame)}
 }
 

server/oscar/mock_chat_nav_service_test.go

@@ -18,10 +18,19 @@ func newMockChatNavService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatNavService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatNavService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockChatNavService_CreateRoom_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0E_0x02_ChatRoomInfoUpdate
-func (_e *mockChatNavService_Expecter) CreateRoom(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockChatNavService_CreateRoom_Call {
+func (_e *mockChatNavService_Expecter) CreateRoom(ctx any, instance any, inFrame any, inBody any) *mockChatNavService_CreateRoom_Call {
 	return &mockChatNavService_CreateRoom_Call{Call: _e.mock.On("CreateRoom", ctx, instance, inFrame, inBody)}
 }
 
@@ -152,7 +161,7 @@ type mockChatNavService_ExchangeInfo_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0D_0x03_ChatNavRequestExchangeInfo
-func (_e *mockChatNavService_Expecter) ExchangeInfo(ctx interface{}, inFrame interface{}, inBody interface{}) *mockChatNavService_ExchangeInfo_Call {
+func (_e *mockChatNavService_Expecter) ExchangeInfo(ctx any, inFrame any, inBody any) *mockChatNavService_ExchangeInfo_Call {
 	return &mockChatNavService_ExchangeInfo_Call{Call: _e.mock.On("ExchangeInfo", ctx, inFrame, inBody)}
 }
 
@@ -214,7 +223,7 @@ type mockChatNavService_RequestChatRights_Call struct {
 // RequestChatRights is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockChatNavService_Expecter) RequestChatRights(ctx interface{}, inFrame interface{}) *mockChatNavService_RequestChatRights_Call {
+func (_e *mockChatNavService_Expecter) RequestChatRights(ctx any, inFrame any) *mockChatNavService_RequestChatRights_Call {
 	return &mockChatNavService_RequestChatRights_Call{Call: _e.mock.On("RequestChatRights", ctx, inFrame)}
 }
 
@@ -281,7 +290,7 @@ type mockChatNavService_RequestRoomInfo_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0D_0x04_ChatNavRequestRoomInfo
-func (_e *mockChatNavService_Expecter) RequestRoomInfo(ctx interface{}, inFrame interface{}, inBody interface{}) *mockChatNavService_RequestRoomInfo_Call {
+func (_e *mockChatNavService_Expecter) RequestRoomInfo(ctx any, inFrame any, inBody any) *mockChatNavService_RequestRoomInfo_Call {
 	return &mockChatNavService_RequestRoomInfo_Call{Call: _e.mock.On("RequestRoomInfo", ctx, inFrame, inBody)}
 }
 

server/oscar/mock_chat_service_test.go

@@ -18,10 +18,19 @@ func newMockChatService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockChatService_ChannelMsgToHost_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0E_0x05_ChatChannelMsgToHost
-func (_e *mockChatService_Expecter) ChannelMsgToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockChatService_ChannelMsgToHost_Call {
+func (_e *mockChatService_Expecter) ChannelMsgToHost(ctx any, instance any, inFrame any, inBody any) *mockChatService_ChannelMsgToHost_Call {
 	return &mockChatService_ChannelMsgToHost_Call{Call: _e.mock.On("ChannelMsgToHost", ctx, instance, inFrame, inBody)}
 }
 

server/oscar/mock_chat_session_manager_test.go

@@ -15,10 +15,19 @@ func newMockChatSessionManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatSessionManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatSessionManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -49,7 +58,7 @@ type mockChatSessionManager_RemoveUserFromAllChats_Call struct {
 
 // RemoveUserFromAllChats is a helper method to define mock.On call
 //   - user state.IdentScreenName
-func (_e *mockChatSessionManager_Expecter) RemoveUserFromAllChats(user interface{}) *mockChatSessionManager_RemoveUserFromAllChats_Call {
+func (_e *mockChatSessionManager_Expecter) RemoveUserFromAllChats(user any) *mockChatSessionManager_RemoveUserFromAllChats_Call {
 	return &mockChatSessionManager_RemoveUserFromAllChats_Call{Call: _e.mock.On("RemoveUserFromAllChats", user)}
 }
 

server/oscar/mock_departure_notifier_test.go

@@ -18,10 +18,19 @@ func newMockDepartureNotifier(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockDepartureNotifier {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockDepartureNotifier{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockDepartureNotifier_BroadcastBuddyArrived_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - userInfo wire.TLVUserInfo
-func (_e *mockDepartureNotifier_Expecter) BroadcastBuddyArrived(ctx interface{}, screenName interface{}, userInfo interface{}) *mockDepartureNotifier_BroadcastBuddyArrived_Call {
+func (_e *mockDepartureNotifier_Expecter) BroadcastBuddyArrived(ctx any, screenName any, userInfo any) *mockDepartureNotifier_BroadcastBuddyArrived_Call {
 	return &mockDepartureNotifier_BroadcastBuddyArrived_Call{Call: _e.mock.On("BroadcastBuddyArrived", ctx, screenName, userInfo)}
 }
 
@@ -127,7 +136,7 @@ type mockDepartureNotifier_BroadcastBuddyDeparted_Call struct {
 // BroadcastBuddyDeparted is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockDepartureNotifier_Expecter) BroadcastBuddyDeparted(ctx interface{}, screenName interface{}) *mockDepartureNotifier_BroadcastBuddyDeparted_Call {
+func (_e *mockDepartureNotifier_Expecter) BroadcastBuddyDeparted(ctx any, screenName any) *mockDepartureNotifier_BroadcastBuddyDeparted_Call {
 	return &mockDepartureNotifier_BroadcastBuddyDeparted_Call{Call: _e.mock.On("BroadcastBuddyDeparted", ctx, screenName)}
 }
 

server/oscar/mock_feedbag_service_test.go

@@ -18,10 +18,19 @@ func newMockFeedbagService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockFeedbagService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockFeedbagService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockFeedbagService_DeleteItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x0A_FeedbagDeleteItem
-func (_e *mockFeedbagService_Expecter) DeleteItem(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_DeleteItem_Call {
+func (_e *mockFeedbagService_Expecter) DeleteItem(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_DeleteItem_Call {
 	return &mockFeedbagService_DeleteItem_Call{Call: _e.mock.On("DeleteItem", ctx, instance, inFrame, inBody)}
 }
 
@@ -145,7 +154,7 @@ type mockFeedbagService_EndCluster_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockFeedbagService_Expecter) EndCluster(ctx interface{}, instance interface{}, inFrame interface{}) *mockFeedbagService_EndCluster_Call {
+func (_e *mockFeedbagService_Expecter) EndCluster(ctx any, instance any, inFrame any) *mockFeedbagService_EndCluster_Call {
 	return &mockFeedbagService_EndCluster_Call{Call: _e.mock.On("EndCluster", ctx, instance, inFrame)}
 }
 
@@ -220,7 +229,7 @@ type mockFeedbagService_PreAuthorizeBuddy_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x14_FeedbagPreAuthorizeBuddy
-func (_e *mockFeedbagService_Expecter) PreAuthorizeBuddy(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_PreAuthorizeBuddy_Call {
+func (_e *mockFeedbagService_Expecter) PreAuthorizeBuddy(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_PreAuthorizeBuddy_Call {
 	return &mockFeedbagService_PreAuthorizeBuddy_Call{Call: _e.mock.On("PreAuthorizeBuddy", ctx, instance, inFrame, inBody)}
 }
 
@@ -297,7 +306,7 @@ type mockFeedbagService_Query_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockFeedbagService_Expecter) Query(ctx interface{}, instance interface{}, inFrame interface{}) *mockFeedbagService_Query_Call {
+func (_e *mockFeedbagService_Expecter) Query(ctx any, instance any, inFrame any) *mockFeedbagService_Query_Call {
 	return &mockFeedbagService_Query_Call{Call: _e.mock.On("Query", ctx, instance, inFrame)}
 }
 
@@ -370,7 +379,7 @@ type mockFeedbagService_QueryIfModified_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x05_FeedbagQueryIfModified
-func (_e *mockFeedbagService_Expecter) QueryIfModified(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_QueryIfModified_Call {
+func (_e *mockFeedbagService_Expecter) QueryIfModified(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_QueryIfModified_Call {
 	return &mockFeedbagService_QueryIfModified_Call{Call: _e.mock.On("QueryIfModified", ctx, instance, inFrame, inBody)}
 }
 
@@ -439,7 +448,7 @@ type mockFeedbagService_RequestAuthorizeToHost_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x18_FeedbagRequestAuthorizationToHost
-func (_e *mockFeedbagService_Expecter) RequestAuthorizeToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_RequestAuthorizeToHost_Call {
+func (_e *mockFeedbagService_Expecter) RequestAuthorizeToHost(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_RequestAuthorizeToHost_Call {
 	return &mockFeedbagService_RequestAuthorizeToHost_Call{Call: _e.mock.On("RequestAuthorizeToHost", ctx, instance, inFrame, inBody)}
 }
 
@@ -508,7 +517,7 @@ type mockFeedbagService_RespondAuthorizeToHost_Call struct {
 //   - instance state.IdentScreenName
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x1A_FeedbagRespondAuthorizeToHost
-func (_e *mockFeedbagService_Expecter) RespondAuthorizeToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_RespondAuthorizeToHost_Call {
+func (_e *mockFeedbagService_Expecter) RespondAuthorizeToHost(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_RespondAuthorizeToHost_Call {
 	return &mockFeedbagService_RespondAuthorizeToHost_Call{Call: _e.mock.On("RespondAuthorizeToHost", ctx, instance, inFrame, inBody)}
 }
 
@@ -575,7 +584,7 @@ type mockFeedbagService_RightsQuery_Call struct {
 // RightsQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockFeedbagService_Expecter) RightsQuery(ctx interface{}, inFrame interface{}) *mockFeedbagService_RightsQuery_Call {
+func (_e *mockFeedbagService_Expecter) RightsQuery(ctx any, inFrame any) *mockFeedbagService_RightsQuery_Call {
 	return &mockFeedbagService_RightsQuery_Call{Call: _e.mock.On("RightsQuery", ctx, inFrame)}
 }
 
@@ -623,7 +632,7 @@ type mockFeedbagService_StartCluster_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x11_FeedbagStartCluster
-func (_e *mockFeedbagService_Expecter) StartCluster(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_StartCluster_Call {
+func (_e *mockFeedbagService_Expecter) StartCluster(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_StartCluster_Call {
 	return &mockFeedbagService_StartCluster_Call{Call: _e.mock.On("StartCluster", ctx, instance, inFrame, inBody)}
 }
 
@@ -703,7 +712,7 @@ type mockFeedbagService_UpsertItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - items []wire.FeedbagItem
-func (_e *mockFeedbagService_Expecter) UpsertItem(ctx interface{}, instance interface{}, inFrame interface{}, items interface{}) *mockFeedbagService_UpsertItem_Call {
+func (_e *mockFeedbagService_Expecter) UpsertItem(ctx any, instance any, inFrame any, items any) *mockFeedbagService_UpsertItem_Call {
 	return &mockFeedbagService_UpsertItem_Call{Call: _e.mock.On("UpsertItem", ctx, instance, inFrame, items)}
 }
 
@@ -770,7 +779,7 @@ type mockFeedbagService_Use_Call struct {
 // Use is a helper method to define mock.On call
 //   - ctx context.Context
 //   - instance *state.SessionInstance
-func (_e *mockFeedbagService_Expecter) Use(ctx interface{}, instance interface{}) *mockFeedbagService_Use_Call {
+func (_e *mockFeedbagService_Expecter) Use(ctx any, instance any) *mockFeedbagService_Use_Call {
 	return &mockFeedbagService_Use_Call{Call: _e.mock.On("Use", ctx, instance)}
 }
 

server/oscar/mock_icbm_service_test.go

@@ -18,10 +18,19 @@ func newMockICBMService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICBMService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICBMService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockICBMService_ChannelMsgToHost_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x06_ICBMChannelMsgToHost
-func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ChannelMsgToHost_Call {
+func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ChannelMsgToHost_Call {
 	return &mockICBMService_ChannelMsgToHost_Call{Call: _e.mock.On("ChannelMsgToHost", ctx, instance, inFrame, inBody)}
 }
 
@@ -146,7 +155,7 @@ type mockICBMService_ClientErr_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x0B_ICBMClientErr
-func (_e *mockICBMService_Expecter) ClientErr(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ClientErr_Call {
+func (_e *mockICBMService_Expecter) ClientErr(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ClientErr_Call {
 	return &mockICBMService_ClientErr_Call{Call: _e.mock.On("ClientErr", ctx, instance, inFrame, inBody)}
 }
 
@@ -215,7 +224,7 @@ type mockICBMService_ClientEvent_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x14_ICBMClientEvent
-func (_e *mockICBMService_Expecter) ClientEvent(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ClientEvent_Call {
+func (_e *mockICBMService_Expecter) ClientEvent(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ClientEvent_Call {
 	return &mockICBMService_ClientEvent_Call{Call: _e.mock.On("ClientEvent", ctx, instance, inFrame, inBody)}
 }
 
@@ -293,7 +302,7 @@ type mockICBMService_EvilRequest_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x08_ICBMEvilRequest
-func (_e *mockICBMService_Expecter) EvilRequest(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_EvilRequest_Call {
+func (_e *mockICBMService_Expecter) EvilRequest(ctx any, instance any, inFrame any, inBody any) *mockICBMService_EvilRequest_Call {
 	return &mockICBMService_EvilRequest_Call{Call: _e.mock.On("EvilRequest", ctx, instance, inFrame, inBody)}
 }
 
@@ -370,7 +379,7 @@ type mockICBMService_OfflineRetrieve_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockICBMService_Expecter) OfflineRetrieve(ctx interface{}, instance interface{}, inFrame interface{}) *mockICBMService_OfflineRetrieve_Call {
+func (_e *mockICBMService_Expecter) OfflineRetrieve(ctx any, instance any, inFrame any) *mockICBMService_OfflineRetrieve_Call {
 	return &mockICBMService_OfflineRetrieve_Call{Call: _e.mock.On("OfflineRetrieve", ctx, instance, inFrame)}
 }
 
@@ -432,7 +441,7 @@ type mockICBMService_ParameterQuery_Call struct {
 // ParameterQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockICBMService_Expecter) ParameterQuery(ctx interface{}, inFrame interface{}) *mockICBMService_ParameterQuery_Call {
+func (_e *mockICBMService_Expecter) ParameterQuery(ctx any, inFrame any) *mockICBMService_ParameterQuery_Call {
 	return &mockICBMService_ParameterQuery_Call{Call: _e.mock.On("ParameterQuery", ctx, inFrame)}
 }
 
@@ -489,7 +498,7 @@ type mockICBMService_RestoreWarningLevel_Call struct {
 // RestoreWarningLevel is a helper method to define mock.On call
 //   - ctx context.Context
 //   - instance *state.SessionInstance
-func (_e *mockICBMService_Expecter) RestoreWarningLevel(ctx interface{}, instance interface{}) *mockICBMService_RestoreWarningLevel_Call {
+func (_e *mockICBMService_Expecter) RestoreWarningLevel(ctx any, instance any) *mockICBMService_RestoreWarningLevel_Call {
 	return &mockICBMService_RestoreWarningLevel_Call{Call: _e.mock.On("RestoreWarningLevel", ctx, instance)}
 }
 
@@ -535,7 +544,7 @@ type mockICBMService_UpdateWarnLevel_Call struct {
 // UpdateWarnLevel is a helper method to define mock.On call
 //   - ctx context.Context
 //   - instance *state.SessionInstance
-func (_e *mockICBMService_Expecter) UpdateWarnLevel(ctx interface{}, instance interface{}) *mockICBMService_UpdateWarnLevel_Call {
+func (_e *mockICBMService_Expecter) UpdateWarnLevel(ctx any, instance any) *mockICBMService_UpdateWarnLevel_Call {
 	return &mockICBMService_UpdateWarnLevel_Call{Call: _e.mock.On("UpdateWarnLevel", ctx, instance)}
 }
 

server/oscar/mock_icq_service_test.go

@@ -18,10 +18,19 @@ func newMockICQService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICQService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICQService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockICQService_DeleteMsgReq_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - seq uint16
-func (_e *mockICQService_Expecter) DeleteMsgReq(ctx interface{}, instance interface{}, seq interface{}) *mockICQService_DeleteMsgReq_Call {
+func (_e *mockICQService_Expecter) DeleteMsgReq(ctx any, instance any, seq any) *mockICQService_DeleteMsgReq_Call {
 	return &mockICQService_DeleteMsgReq_Call{Call: _e.mock.On("DeleteMsgReq", ctx, instance, seq)}
 }
 
@@ -130,7 +139,7 @@ type mockICQService_FindByEmail3_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0573_DBQueryMetaReqSearchByEmail3
 //   - seq uint16
-func (_e *mockICQService_Expecter) FindByEmail3(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FindByEmail3_Call {
+func (_e *mockICQService_Expecter) FindByEmail3(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FindByEmail3_Call {
 	return &mockICQService_FindByEmail3_Call{Call: _e.mock.On("FindByEmail3", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -205,7 +214,7 @@ type mockICQService_FindByICQEmail_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0529_DBQueryMetaReqSearchByEmail
 //   - seq uint16
-func (_e *mockICQService_Expecter) FindByICQEmail(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FindByICQEmail_Call {
+func (_e *mockICQService_Expecter) FindByICQEmail(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FindByICQEmail_Call {
 	return &mockICQService_FindByICQEmail_Call{Call: _e.mock.On("FindByICQEmail", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -280,7 +289,7 @@ type mockICQService_FindByICQInterests_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0533_DBQueryMetaReqSearchWhitePages
 //   - seq uint16
-func (_e *mockICQService_Expecter) FindByICQInterests(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FindByICQInterests_Call {
+func (_e *mockICQService_Expecter) FindByICQInterests(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FindByICQInterests_Call {
 	return &mockICQService_FindByICQInterests_Call{Call: _e.mock.On("FindByICQInterests", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -355,7 +364,7 @@ type mockICQService_FindByICQName_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0515_DBQueryMetaReqSearchByDetails
 //   - seq uint16
-func (_e *mockICQService_Expecter) FindByICQName(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FindByICQName_Call {
+func (_e *mockICQService_Expecter) FindByICQName(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FindByICQName_Call {
 	return &mockICQService_FindByICQName_Call{Call: _e.mock.On("FindByICQName", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -430,7 +439,7 @@ type mockICQService_FindByUIN_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x051F_DBQueryMetaReqSearchByUIN
 //   - seq uint16
-func (_e *mockICQService_Expecter) FindByUIN(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FindByUIN_Call {
+func (_e *mockICQService_Expecter) FindByUIN(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FindByUIN_Call {
 	return &mockICQService_FindByUIN_Call{Call: _e.mock.On("FindByUIN", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -505,7 +514,7 @@ type mockICQService_FindByUIN2_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0569_DBQueryMetaReqSearchByUIN2
 //   - seq uint16
-func (_e *mockICQService_Expecter) FindByUIN2(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FindByUIN2_Call {
+func (_e *mockICQService_Expecter) FindByUIN2(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FindByUIN2_Call {
 	return &mockICQService_FindByUIN2_Call{Call: _e.mock.On("FindByUIN2", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -580,7 +589,7 @@ type mockICQService_FindByWhitePages2_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x055F_DBQueryMetaReqSearchWhitePages2
 //   - seq uint16
-func (_e *mockICQService_Expecter) FindByWhitePages2(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FindByWhitePages2_Call {
+func (_e *mockICQService_Expecter) FindByWhitePages2(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FindByWhitePages2_Call {
 	return &mockICQService_FindByWhitePages2_Call{Call: _e.mock.On("FindByWhitePages2", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -655,7 +664,7 @@ type mockICQService_FullUserInfo_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x051F_DBQueryMetaReqSearchByUIN
 //   - seq uint16
-func (_e *mockICQService_Expecter) FullUserInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_FullUserInfo_Call {
+func (_e *mockICQService_Expecter) FullUserInfo(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_FullUserInfo_Call {
 	return &mockICQService_FullUserInfo_Call{Call: _e.mock.On("FullUserInfo", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -729,7 +738,7 @@ type mockICQService_OfflineMsgReq_Call struct {
 //   - inFrame wire.SNACFrame
 //   - instance *state.SessionInstance
 //   - seq uint16
-func (_e *mockICQService_Expecter) OfflineMsgReq(ctx interface{}, inFrame interface{}, instance interface{}, seq interface{}) *mockICQService_OfflineMsgReq_Call {
+func (_e *mockICQService_Expecter) OfflineMsgReq(ctx any, inFrame any, instance any, seq any) *mockICQService_OfflineMsgReq_Call {
 	return &mockICQService_OfflineMsgReq_Call{Call: _e.mock.On("OfflineMsgReq", ctx, inFrame, instance, seq)}
 }
 
@@ -799,7 +808,7 @@ type mockICQService_SetAffiliations_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x041A_DBQueryMetaReqSetAffiliations
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetAffiliations(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetAffiliations_Call {
+func (_e *mockICQService_Expecter) SetAffiliations(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetAffiliations_Call {
 	return &mockICQService_SetAffiliations_Call{Call: _e.mock.On("SetAffiliations", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -874,7 +883,7 @@ type mockICQService_SetBasicInfo_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x03EA_DBQueryMetaReqSetBasicInfo
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetBasicInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetBasicInfo_Call {
+func (_e *mockICQService_Expecter) SetBasicInfo(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetBasicInfo_Call {
 	return &mockICQService_SetBasicInfo_Call{Call: _e.mock.On("SetBasicInfo", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -949,7 +958,7 @@ type mockICQService_SetEmails_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x040B_DBQueryMetaReqSetEmails
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetEmails(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetEmails_Call {
+func (_e *mockICQService_Expecter) SetEmails(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetEmails_Call {
 	return &mockICQService_SetEmails_Call{Call: _e.mock.On("SetEmails", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1024,7 +1033,7 @@ type mockICQService_SetICQInfo_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0C3A_DBQueryMetaReqSetFullInfo
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetICQInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetICQInfo_Call {
+func (_e *mockICQService_Expecter) SetICQInfo(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetICQInfo_Call {
 	return &mockICQService_SetICQInfo_Call{Call: _e.mock.On("SetICQInfo", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1099,7 +1108,7 @@ type mockICQService_SetICQPhone_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0654_DBQueryMetaReqSetICQPhone
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetICQPhone(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetICQPhone_Call {
+func (_e *mockICQService_Expecter) SetICQPhone(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetICQPhone_Call {
 	return &mockICQService_SetICQPhone_Call{Call: _e.mock.On("SetICQPhone", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1174,7 +1183,7 @@ type mockICQService_SetInterests_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0410_DBQueryMetaReqSetInterests
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetInterests(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetInterests_Call {
+func (_e *mockICQService_Expecter) SetInterests(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetInterests_Call {
 	return &mockICQService_SetInterests_Call{Call: _e.mock.On("SetInterests", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1249,7 +1258,7 @@ type mockICQService_SetMoreInfo_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x03FD_DBQueryMetaReqSetMoreInfo
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetMoreInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetMoreInfo_Call {
+func (_e *mockICQService_Expecter) SetMoreInfo(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetMoreInfo_Call {
 	return &mockICQService_SetMoreInfo_Call{Call: _e.mock.On("SetMoreInfo", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1324,7 +1333,7 @@ type mockICQService_SetPermissions_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0424_DBQueryMetaReqSetPermissions
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetPermissions(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetPermissions_Call {
+func (_e *mockICQService_Expecter) SetPermissions(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetPermissions_Call {
 	return &mockICQService_SetPermissions_Call{Call: _e.mock.On("SetPermissions", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1399,7 +1408,7 @@ type mockICQService_SetUserNotes_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0406_DBQueryMetaReqSetNotes
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetUserNotes(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetUserNotes_Call {
+func (_e *mockICQService_Expecter) SetUserNotes(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetUserNotes_Call {
 	return &mockICQService_SetUserNotes_Call{Call: _e.mock.On("SetUserNotes", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1474,7 +1483,7 @@ type mockICQService_SetWorkInfo_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x03F3_DBQueryMetaReqSetWorkInfo
 //   - seq uint16
-func (_e *mockICQService_Expecter) SetWorkInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_SetWorkInfo_Call {
+func (_e *mockICQService_Expecter) SetWorkInfo(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_SetWorkInfo_Call {
 	return &mockICQService_SetWorkInfo_Call{Call: _e.mock.On("SetWorkInfo", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1549,7 +1558,7 @@ type mockICQService_ShortUserInfo_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x04BA_DBQueryMetaReqShortInfo
 //   - seq uint16
-func (_e *mockICQService_Expecter) ShortUserInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_ShortUserInfo_Call {
+func (_e *mockICQService_Expecter) ShortUserInfo(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_ShortUserInfo_Call {
 	return &mockICQService_ShortUserInfo_Call{Call: _e.mock.On("ShortUserInfo", ctx, instance, inFrame, inBody, seq)}
 }
 
@@ -1624,7 +1633,7 @@ type mockICQService_XMLReqData_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.ICQ_0x07D0_0x0898_DBQueryMetaReqXMLReq
 //   - seq uint16
-func (_e *mockICQService_Expecter) XMLReqData(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}, seq interface{}) *mockICQService_XMLReqData_Call {
+func (_e *mockICQService_Expecter) XMLReqData(ctx any, instance any, inFrame any, inBody any, seq any) *mockICQService_XMLReqData_Call {
 	return &mockICQService_XMLReqData_Call{Call: _e.mock.On("XMLReqData", ctx, instance, inFrame, inBody, seq)}
 }
 

server/oscar/mock_locate_service_test.go

@@ -18,10 +18,19 @@ func newMockLocateService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockLocateService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockLocateService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockLocateService_DirInfo_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x0B_LocateGetDirInfo
-func (_e *mockLocateService_Expecter) DirInfo(ctx interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_DirInfo_Call {
+func (_e *mockLocateService_Expecter) DirInfo(ctx any, inFrame any, inBody any) *mockLocateService_DirInfo_Call {
 	return &mockLocateService_DirInfo_Call{Call: _e.mock.On("DirInfo", ctx, inFrame, inBody)}
 }
 
@@ -136,7 +145,7 @@ type mockLocateService_RightsQuery_Call struct {
 // RightsQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockLocateService_Expecter) RightsQuery(ctx interface{}, inFrame interface{}) *mockLocateService_RightsQuery_Call {
+func (_e *mockLocateService_Expecter) RightsQuery(ctx any, inFrame any) *mockLocateService_RightsQuery_Call {
 	return &mockLocateService_RightsQuery_Call{Call: _e.mock.On("RightsQuery", ctx, inFrame)}
 }
 
@@ -204,7 +213,7 @@ type mockLocateService_SetDirInfo_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x09_LocateSetDirInfo
-func (_e *mockLocateService_Expecter) SetDirInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_SetDirInfo_Call {
+func (_e *mockLocateService_Expecter) SetDirInfo(ctx any, instance any, inFrame any, inBody any) *mockLocateService_SetDirInfo_Call {
 	return &mockLocateService_SetDirInfo_Call{Call: _e.mock.On("SetDirInfo", ctx, instance, inFrame, inBody)}
 }
 
@@ -272,7 +281,7 @@ type mockLocateService_SetInfo_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x02_0x04_LocateSetInfo
-func (_e *mockLocateService_Expecter) SetInfo(ctx interface{}, instance interface{}, inBody interface{}) *mockLocateService_SetInfo_Call {
+func (_e *mockLocateService_Expecter) SetInfo(ctx any, instance any, inBody any) *mockLocateService_SetInfo_Call {
 	return &mockLocateService_SetInfo_Call{Call: _e.mock.On("SetInfo", ctx, instance, inBody)}
 }
 
@@ -345,7 +354,7 @@ type mockLocateService_SetKeywordInfo_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x0F_LocateSetKeywordInfo
-func (_e *mockLocateService_Expecter) SetKeywordInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_SetKeywordInfo_Call {
+func (_e *mockLocateService_Expecter) SetKeywordInfo(ctx any, instance any, inFrame any, inBody any) *mockLocateService_SetKeywordInfo_Call {
 	return &mockLocateService_SetKeywordInfo_Call{Call: _e.mock.On("SetKeywordInfo", ctx, instance, inFrame, inBody)}
 }
 
@@ -423,7 +432,7 @@ type mockLocateService_UserInfoQuery_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x05_LocateUserInfoQuery
-func (_e *mockLocateService_Expecter) UserInfoQuery(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_UserInfoQuery_Call {
+func (_e *mockLocateService_Expecter) UserInfoQuery(ctx any, instance any, inFrame any, inBody any) *mockLocateService_UserInfoQuery_Call {
 	return &mockLocateService_UserInfoQuery_Call{Call: _e.mock.On("UserInfoQuery", ctx, instance, inFrame, inBody)}
 }
 

server/oscar/mock_odir_service_test.go

@@ -17,10 +17,19 @@ func newMockODirService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockODirService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockODirService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockODirService_InfoQuery_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0F_0x02_InfoQuery
-func (_e *mockODirService_Expecter) InfoQuery(ctx interface{}, inFrame interface{}, inBody interface{}) *mockODirService_InfoQuery_Call {
+func (_e *mockODirService_Expecter) InfoQuery(ctx any, inFrame any, inBody any) *mockODirService_InfoQuery_Call {
 	return &mockODirService_InfoQuery_Call{Call: _e.mock.On("InfoQuery", ctx, inFrame, inBody)}
 }
 
@@ -144,7 +153,7 @@ type mockODirService_KeywordListQuery_Call struct {
 // KeywordListQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockODirService_Expecter) KeywordListQuery(ctx interface{}, inFrame interface{}) *mockODirService_KeywordListQuery_Call {
+func (_e *mockODirService_Expecter) KeywordListQuery(ctx any, inFrame any) *mockODirService_KeywordListQuery_Call {
 	return &mockODirService_KeywordListQuery_Call{Call: _e.mock.On("KeywordListQuery", ctx, inFrame)}
 }
 

server/oscar/mock_online_notifier_test.go

@@ -15,10 +15,19 @@ func newMockOnlineNotifier(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockOnlineNotifier {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockOnlineNotifier{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -60,7 +69,7 @@ type mockOnlineNotifier_HostOnline_Call struct {
 
 // HostOnline is a helper method to define mock.On call
 //   - service uint16
-func (_e *mockOnlineNotifier_Expecter) HostOnline(service interface{}) *mockOnlineNotifier_HostOnline_Call {
+func (_e *mockOnlineNotifier_Expecter) HostOnline(service any) *mockOnlineNotifier_HostOnline_Call {
 	return &mockOnlineNotifier_HostOnline_Call{Call: _e.mock.On("HostOnline", service)}
 }
 

server/oscar/mock_oservice_service_test.go

@@ -19,10 +19,19 @@ func newMockOServiceService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockOServiceService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockOServiceService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -67,7 +76,7 @@ type mockOServiceService_ClientOnline_Call struct {
 //   - service uint16
 //   - inBody wire.SNAC_0x01_0x02_OServiceClientOnline
 //   - instance *state.SessionInstance
-func (_e *mockOServiceService_Expecter) ClientOnline(ctx interface{}, service interface{}, inBody interface{}, instance interface{}) *mockOServiceService_ClientOnline_Call {
+func (_e *mockOServiceService_Expecter) ClientOnline(ctx any, service any, inBody any, instance any) *mockOServiceService_ClientOnline_Call {
 	return &mockOServiceService_ClientOnline_Call{Call: _e.mock.On("ClientOnline", ctx, service, inBody, instance)}
 }
 
@@ -138,7 +147,7 @@ type mockOServiceService_ClientVersions_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x01_0x17_OServiceClientVersions
-func (_e *mockOServiceService_Expecter) ClientVersions(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockOServiceService_ClientVersions_Call {
+func (_e *mockOServiceService_Expecter) ClientVersions(ctx any, instance any, inFrame any, inBody any) *mockOServiceService_ClientVersions_Call {
 	return &mockOServiceService_ClientVersions_Call{Call: _e.mock.On("ClientVersions", ctx, instance, inFrame, inBody)}
 }
 
@@ -204,7 +213,7 @@ type mockOServiceService_HostOnline_Call struct {
 
 // HostOnline is a helper method to define mock.On call
 //   - service uint16
-func (_e *mockOServiceService_Expecter) HostOnline(service interface{}) *mockOServiceService_HostOnline_Call {
+func (_e *mockOServiceService_Expecter) HostOnline(service any) *mockOServiceService_HostOnline_Call {
 	return &mockOServiceService_HostOnline_Call{Call: _e.mock.On("HostOnline", service)}
 }
 
@@ -257,7 +266,7 @@ type mockOServiceService_IdleNotification_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x01_0x11_OServiceIdleNotification
-func (_e *mockOServiceService_Expecter) IdleNotification(ctx interface{}, instance interface{}, inBody interface{}) *mockOServiceService_IdleNotification_Call {
+func (_e *mockOServiceService_Expecter) IdleNotification(ctx any, instance any, inBody any) *mockOServiceService_IdleNotification_Call {
 	return &mockOServiceService_IdleNotification_Call{Call: _e.mock.On("IdleNotification", ctx, instance, inBody)}
 }
 
@@ -319,7 +328,7 @@ type mockOServiceService_ProbeReq_Call struct {
 // ProbeReq is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockOServiceService_Expecter) ProbeReq(ctx interface{}, inFrame interface{}) *mockOServiceService_ProbeReq_Call {
+func (_e *mockOServiceService_Expecter) ProbeReq(ctx any, inFrame any) *mockOServiceService_ProbeReq_Call {
 	return &mockOServiceService_ProbeReq_Call{Call: _e.mock.On("ProbeReq", ctx, inFrame)}
 }
 
@@ -377,7 +386,7 @@ type mockOServiceService_RateParamsQuery_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockOServiceService_Expecter) RateParamsQuery(ctx interface{}, instance interface{}, inFrame interface{}) *mockOServiceService_RateParamsQuery_Call {
+func (_e *mockOServiceService_Expecter) RateParamsQuery(ctx any, instance any, inFrame any) *mockOServiceService_RateParamsQuery_Call {
 	return &mockOServiceService_RateParamsQuery_Call{Call: _e.mock.On("RateParamsQuery", ctx, instance, inFrame)}
 }
 
@@ -429,7 +438,7 @@ type mockOServiceService_RateParamsSubAdd_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x01_0x08_OServiceRateParamsSubAdd
-func (_e *mockOServiceService_Expecter) RateParamsSubAdd(ctx interface{}, instance interface{}, inBody interface{}) *mockOServiceService_RateParamsSubAdd_Call {
+func (_e *mockOServiceService_Expecter) RateParamsSubAdd(ctx any, instance any, inBody any) *mockOServiceService_RateParamsSubAdd_Call {
 	return &mockOServiceService_RateParamsSubAdd_Call{Call: _e.mock.On("RateParamsSubAdd", ctx, instance, inBody)}
 }
 
@@ -504,7 +513,7 @@ type mockOServiceService_ServiceRequest_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x01_0x04_OServiceServiceRequest
 //   - listenerGroup config.ListenerGroup
-func (_e *mockOServiceService_Expecter) ServiceRequest(ctx interface{}, service interface{}, instance interface{}, inFrame interface{}, inBody interface{}, listenerGroup interface{}) *mockOServiceService_ServiceRequest_Call {
+func (_e *mockOServiceService_Expecter) ServiceRequest(ctx any, service any, instance any, inFrame any, inBody any, listenerGroup any) *mockOServiceService_ServiceRequest_Call {
 	return &mockOServiceService_ServiceRequest_Call{Call: _e.mock.On("ServiceRequest", ctx, service, instance, inFrame, inBody, listenerGroup)}
 }
 
@@ -570,7 +579,7 @@ type mockOServiceService_SetPrivacyFlags_Call struct {
 // SetPrivacyFlags is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inBody wire.SNAC_0x01_0x14_OServiceSetPrivacyFlags
-func (_e *mockOServiceService_Expecter) SetPrivacyFlags(ctx interface{}, inBody interface{}) *mockOServiceService_SetPrivacyFlags_Call {
+func (_e *mockOServiceService_Expecter) SetPrivacyFlags(ctx any, inBody any) *mockOServiceService_SetPrivacyFlags_Call {
 	return &mockOServiceService_SetPrivacyFlags_Call{Call: _e.mock.On("SetPrivacyFlags", ctx, inBody)}
 }
 
@@ -603,29 +612,20 @@ func (_c *mockOServiceService_SetPrivacyFlags_Call) RunAndReturn(run func(ctx co
 }
 
 // SetUserInfoFields provides a mock function for the type mockOServiceService
-func (_mock *mockOServiceService) SetUserInfoFields(ctx context.Context, instance *state.SessionInstance, inFrame wire.SNACFrame, inBody wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (wire.SNACMessage, error) {
+func (_mock *mockOServiceService) SetUserInfoFields(ctx context.Context, instance *state.SessionInstance, inFrame wire.SNACFrame, inBody wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) error {
 	ret := _mock.Called(ctx, instance, inFrame, inBody)
 
 	if len(ret) == 0 {
 		panic("no return value specified for SetUserInfoFields")
 	}
 
-	var r0 wire.SNACMessage
-	var r1 error
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *state.SessionInstance, wire.SNACFrame, wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (wire.SNACMessage, error)); ok {
-		return returnFunc(ctx, instance, inFrame, inBody)
-	}
-	if returnFunc, ok := ret.Get(0).(func(context.Context, *state.SessionInstance, wire.SNACFrame, wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) wire.SNACMessage); ok {
+	var r0 error
+	if returnFunc, ok := ret.Get(0).(func(context.Context, *state.SessionInstance, wire.SNACFrame, wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) error); ok {
 		r0 = returnFunc(ctx, instance, inFrame, inBody)
 	} else {
-		r0 = ret.Get(0).(wire.SNACMessage)
-	}
-	if returnFunc, ok := ret.Get(1).(func(context.Context, *state.SessionInstance, wire.SNACFrame, wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) error); ok {
-		r1 = returnFunc(ctx, instance, inFrame, inBody)
-	} else {
-		r1 = ret.Error(1)
+		r0 = ret.Error(0)
 	}
-	return r0, r1
+	return r0
 }
 
 // mockOServiceService_SetUserInfoFields_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetUserInfoFields'
@@ -638,7 +638,7 @@ type mockOServiceService_SetUserInfoFields_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields
-func (_e *mockOServiceService_Expecter) SetUserInfoFields(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockOServiceService_SetUserInfoFields_Call {
+func (_e *mockOServiceService_Expecter) SetUserInfoFields(ctx any, instance any, inFrame any, inBody any) *mockOServiceService_SetUserInfoFields_Call {
 	return &mockOServiceService_SetUserInfoFields_Call{Call: _e.mock.On("SetUserInfoFields", ctx, instance, inFrame, inBody)}
 }
 
@@ -670,12 +670,12 @@ func (_c *mockOServiceService_SetUserInfoFields_Call) Run(run func(ctx context.C
 	return _c
 }
 
-func (_c *mockOServiceService_SetUserInfoFields_Call) Return(sNACMessage wire.SNACMessage, err error) *mockOServiceService_SetUserInfoFields_Call {
-	_c.Call.Return(sNACMessage, err)
+func (_c *mockOServiceService_SetUserInfoFields_Call) Return(err error) *mockOServiceService_SetUserInfoFields_Call {
+	_c.Call.Return(err)
 	return _c
 }
 
-func (_c *mockOServiceService_SetUserInfoFields_Call) RunAndReturn(run func(ctx context.Context, instance *state.SessionInstance, inFrame wire.SNACFrame, inBody wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) (wire.SNACMessage, error)) *mockOServiceService_SetUserInfoFields_Call {
+func (_c *mockOServiceService_SetUserInfoFields_Call) RunAndReturn(run func(ctx context.Context, instance *state.SessionInstance, inFrame wire.SNACFrame, inBody wire.SNAC_0x01_0x1E_OServiceSetUserInfoFields) error) *mockOServiceService_SetUserInfoFields_Call {
 	_c.Call.Return(run)
 	return _c
 }
@@ -706,7 +706,7 @@ type mockOServiceService_UserInfoQuery_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockOServiceService_Expecter) UserInfoQuery(ctx interface{}, instance interface{}, inFrame interface{}) *mockOServiceService_UserInfoQuery_Call {
+func (_e *mockOServiceService_Expecter) UserInfoQuery(ctx any, instance any, inFrame any) *mockOServiceService_UserInfoQuery_Call {
 	return &mockOServiceService_UserInfoQuery_Call{Call: _e.mock.On("UserInfoQuery", ctx, instance, inFrame)}
 }
 

server/oscar/mock_permit_deny_service_test.go

@@ -18,10 +18,19 @@ func newMockPermitDenyService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockPermitDenyService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockPermitDenyService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockPermitDenyService_AddDenyListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x07_PermitDenyAddDenyListEntries
-func (_e *mockPermitDenyService_Expecter) AddDenyListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_AddDenyListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) AddDenyListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_AddDenyListEntries_Call {
 	return &mockPermitDenyService_AddDenyListEntries_Call{Call: _e.mock.On("AddDenyListEntries", ctx, instance, inBody)}
 }
 
@@ -128,7 +137,7 @@ type mockPermitDenyService_AddPermListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x05_PermitDenyAddPermListEntries
-func (_e *mockPermitDenyService_Expecter) AddPermListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_AddPermListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) AddPermListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_AddPermListEntries_Call {
 	return &mockPermitDenyService_AddPermListEntries_Call{Call: _e.mock.On("AddPermListEntries", ctx, instance, inBody)}
 }
 
@@ -191,7 +200,7 @@ type mockPermitDenyService_DelDenyListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x08_PermitDenyDelDenyListEntries
-func (_e *mockPermitDenyService_Expecter) DelDenyListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_DelDenyListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) DelDenyListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_DelDenyListEntries_Call {
 	return &mockPermitDenyService_DelDenyListEntries_Call{Call: _e.mock.On("DelDenyListEntries", ctx, instance, inBody)}
 }
 
@@ -254,7 +263,7 @@ type mockPermitDenyService_DelPermListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x06_PermitDenyDelPermListEntries
-func (_e *mockPermitDenyService_Expecter) DelPermListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_DelPermListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) DelPermListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_DelPermListEntries_Call {
 	return &mockPermitDenyService_DelPermListEntries_Call{Call: _e.mock.On("DelPermListEntries", ctx, instance, inBody)}
 }
 
@@ -316,7 +325,7 @@ type mockPermitDenyService_RightsQuery_Call struct {
 // RightsQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockPermitDenyService_Expecter) RightsQuery(ctx interface{}, inFrame interface{}) *mockPermitDenyService_RightsQuery_Call {
+func (_e *mockPermitDenyService_Expecter) RightsQuery(ctx any, inFrame any) *mockPermitDenyService_RightsQuery_Call {
 	return &mockPermitDenyService_RightsQuery_Call{Call: _e.mock.On("RightsQuery", ctx, inFrame)}
 }
 

server/oscar/mock_rate_limit_updater_test.go

@@ -17,10 +17,19 @@ func newMockRateLimitUpdater(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockRateLimitUpdater {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockRateLimitUpdater{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -52,7 +61,7 @@ type mockRateLimitUpdater_MonitorRateLimits_Call struct {
 // MonitorRateLimits is a helper method to define mock.On call
 //   - ctx context.Context
 //   - session *state.Session
-func (_e *mockRateLimitUpdater_Expecter) MonitorRateLimits(ctx interface{}, session interface{}) *mockRateLimitUpdater_MonitorRateLimits_Call {
+func (_e *mockRateLimitUpdater_Expecter) MonitorRateLimits(ctx any, session any) *mockRateLimitUpdater_MonitorRateLimits_Call {
 	return &mockRateLimitUpdater_MonitorRateLimits_Call{Call: _e.mock.On("MonitorRateLimits", ctx, session)}
 }
 

server/oscar/mock_response_writer_test.go

@@ -15,10 +15,19 @@ func newMockResponseWriter(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockResponseWriter {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockResponseWriter{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -61,7 +70,7 @@ type mockResponseWriter_SendSNAC_Call struct {
 // SendSNAC is a helper method to define mock.On call
 //   - frame wire.SNACFrame
 //   - body any
-func (_e *mockResponseWriter_Expecter) SendSNAC(frame interface{}, body interface{}) *mockResponseWriter_SendSNAC_Call {
+func (_e *mockResponseWriter_Expecter) SendSNAC(frame any, body any) *mockResponseWriter_SendSNAC_Call {
 	return &mockResponseWriter_SendSNAC_Call{Call: _e.mock.On("SendSNAC", frame, body)}
 }
 

server/oscar/mock_stats_service_test.go

@@ -17,10 +17,19 @@ func newMockStatsService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockStatsService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockStatsService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -64,7 +73,7 @@ type mockStatsService_ReportEvents_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0B_0x03_StatsReportEvents
-func (_e *mockStatsService_Expecter) ReportEvents(ctx interface{}, inFrame interface{}, inBody interface{}) *mockStatsService_ReportEvents_Call {
+func (_e *mockStatsService_Expecter) ReportEvents(ctx any, inFrame any, inBody any) *mockStatsService_ReportEvents_Call {
 	return &mockStatsService_ReportEvents_Call{Call: _e.mock.On("ReportEvents", ctx, inFrame, inBody)}
 }
 

server/oscar/mock_user_lookup_service_test.go

@@ -17,10 +17,19 @@ func newMockUserLookupService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockUserLookupService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockUserLookupService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockUserLookupService_FindByEmail_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0A_0x02_UserLookupFindByEmail
-func (_e *mockUserLookupService_Expecter) FindByEmail(ctx interface{}, inFrame interface{}, inBody interface{}) *mockUserLookupService_FindByEmail_Call {
+func (_e *mockUserLookupService_Expecter) FindByEmail(ctx any, inFrame any, inBody any) *mockUserLookupService_FindByEmail_Call {
 	return &mockUserLookupService_FindByEmail_Call{Call: _e.mock.On("FindByEmail", ctx, inFrame, inBody)}
 }
 

server/toc/mock_admin_service_test.go

@@ -18,10 +18,19 @@ func newMockAdminService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAdminService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAdminService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockAdminService_InfoChangeRequest_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x07_0x04_AdminInfoChangeRequest
-func (_e *mockAdminService_Expecter) InfoChangeRequest(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockAdminService_InfoChangeRequest_Call {
+func (_e *mockAdminService_Expecter) InfoChangeRequest(ctx any, instance any, inFrame any, inBody any) *mockAdminService_InfoChangeRequest_Call {
 	return &mockAdminService_InfoChangeRequest_Call{Call: _e.mock.On("InfoChangeRequest", ctx, instance, inFrame, inBody)}
 }
 

server/toc/mock_auth_service_test.go

@@ -21,10 +21,19 @@ func newMockAuthService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockAuthService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockAuthService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockAuthService_BUCPChallenge_Call struct {
 //   - ctx context.Context
 //   - inBody wire.SNAC_0x17_0x06_BUCPChallengeRequest
 //   - newUUID func() uuid.UUID
-func (_e *mockAuthService_Expecter) BUCPChallenge(ctx interface{}, inBody interface{}, newUUID interface{}) *mockAuthService_BUCPChallenge_Call {
+func (_e *mockAuthService_Expecter) BUCPChallenge(ctx any, inBody any, newUUID any) *mockAuthService_BUCPChallenge_Call {
 	return &mockAuthService_BUCPChallenge_Call{Call: _e.mock.On("BUCPChallenge", ctx, inBody, newUUID)}
 }
 
@@ -149,7 +158,7 @@ type mockAuthService_BUCPLogin_Call struct {
 //   - ctx context.Context
 //   - inBody wire.SNAC_0x17_0x02_BUCPLoginRequest
 //   - endpointCfg config.Endpoint
-func (_e *mockAuthService_Expecter) BUCPLogin(ctx interface{}, inBody interface{}, endpointCfg interface{}) *mockAuthService_BUCPLogin_Call {
+func (_e *mockAuthService_Expecter) BUCPLogin(ctx any, inBody any, endpointCfg any) *mockAuthService_BUCPLogin_Call {
 	return &mockAuthService_BUCPLogin_Call{Call: _e.mock.On("BUCPLogin", ctx, inBody, endpointCfg)}
 }
 
@@ -225,7 +234,7 @@ type mockAuthService_CrackCookie_Call struct {
 
 // CrackCookie is a helper method to define mock.On call
 //   - authCookie []byte
-func (_e *mockAuthService_Expecter) CrackCookie(authCookie interface{}) *mockAuthService_CrackCookie_Call {
+func (_e *mockAuthService_Expecter) CrackCookie(authCookie any) *mockAuthService_CrackCookie_Call {
 	return &mockAuthService_CrackCookie_Call{Call: _e.mock.On("CrackCookie", authCookie)}
 }
 
@@ -287,7 +296,7 @@ type mockAuthService_FLAPLogin_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.FLAPSignonFrame
 //   - endpointCfg config.Endpoint
-func (_e *mockAuthService_Expecter) FLAPLogin(ctx interface{}, inFrame interface{}, endpointCfg interface{}) *mockAuthService_FLAPLogin_Call {
+func (_e *mockAuthService_Expecter) FLAPLogin(ctx any, inFrame any, endpointCfg any) *mockAuthService_FLAPLogin_Call {
 	return &mockAuthService_FLAPLogin_Call{Call: _e.mock.On("FLAPLogin", ctx, inFrame, endpointCfg)}
 }
 
@@ -361,7 +370,7 @@ type mockAuthService_RegisterBOSSession_Call struct {
 //   - ctx context.Context
 //   - authCookie state.ServerCookie
 //   - cfg func(*state.Session)
-func (_e *mockAuthService_Expecter) RegisterBOSSession(ctx interface{}, authCookie interface{}, cfg interface{}) *mockAuthService_RegisterBOSSession_Call {
+func (_e *mockAuthService_Expecter) RegisterBOSSession(ctx any, authCookie any, cfg any) *mockAuthService_RegisterBOSSession_Call {
 	return &mockAuthService_RegisterBOSSession_Call{Call: _e.mock.On("RegisterBOSSession", ctx, authCookie, cfg)}
 }
 
@@ -435,7 +444,7 @@ type mockAuthService_RegisterChatSession_Call struct {
 //   - ctx context.Context
 //   - authCookie state.ServerCookie
 //   - cfg func(sess *state.Session)
-func (_e *mockAuthService_Expecter) RegisterChatSession(ctx interface{}, authCookie interface{}, cfg interface{}) *mockAuthService_RegisterChatSession_Call {
+func (_e *mockAuthService_Expecter) RegisterChatSession(ctx any, authCookie any, cfg any) *mockAuthService_RegisterChatSession_Call {
 	return &mockAuthService_RegisterChatSession_Call{Call: _e.mock.On("RegisterChatSession", ctx, authCookie, cfg)}
 }
 
@@ -508,7 +517,7 @@ type mockAuthService_RetrieveBOSSession_Call struct {
 // RetrieveBOSSession is a helper method to define mock.On call
 //   - ctx context.Context
 //   - authCookie state.ServerCookie
-func (_e *mockAuthService_Expecter) RetrieveBOSSession(ctx interface{}, authCookie interface{}) *mockAuthService_RetrieveBOSSession_Call {
+func (_e *mockAuthService_Expecter) RetrieveBOSSession(ctx any, authCookie any) *mockAuthService_RetrieveBOSSession_Call {
 	return &mockAuthService_RetrieveBOSSession_Call{Call: _e.mock.On("RetrieveBOSSession", ctx, authCookie)}
 }
 
@@ -554,7 +563,7 @@ type mockAuthService_Signout_Call struct {
 // Signout is a helper method to define mock.On call
 //   - ctx context.Context
 //   - session *state.Session
-func (_e *mockAuthService_Expecter) Signout(ctx interface{}, session interface{}) *mockAuthService_Signout_Call {
+func (_e *mockAuthService_Expecter) Signout(ctx any, session any) *mockAuthService_Signout_Call {
 	return &mockAuthService_Signout_Call{Call: _e.mock.On("Signout", ctx, session)}
 }
 
@@ -600,7 +609,7 @@ type mockAuthService_SignoutChat_Call struct {
 // SignoutChat is a helper method to define mock.On call
 //   - ctx context.Context
 //   - sess *state.Session
-func (_e *mockAuthService_Expecter) SignoutChat(ctx interface{}, sess interface{}) *mockAuthService_SignoutChat_Call {
+func (_e *mockAuthService_Expecter) SignoutChat(ctx any, sess any) *mockAuthService_SignoutChat_Call {
 	return &mockAuthService_SignoutChat_Call{Call: _e.mock.On("SignoutChat", ctx, sess)}
 }
 

server/toc/mock_buddy_list_registry_test.go

@@ -17,10 +17,19 @@ func newMockBuddyListRegistry(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyListRegistry {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyListRegistry{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -63,7 +72,7 @@ type mockBuddyListRegistry_RegisterBuddyList_Call struct {
 // RegisterBuddyList is a helper method to define mock.On call
 //   - ctx context.Context
 //   - user state.IdentScreenName
-func (_e *mockBuddyListRegistry_Expecter) RegisterBuddyList(ctx interface{}, user interface{}) *mockBuddyListRegistry_RegisterBuddyList_Call {
+func (_e *mockBuddyListRegistry_Expecter) RegisterBuddyList(ctx any, user any) *mockBuddyListRegistry_RegisterBuddyList_Call {
 	return &mockBuddyListRegistry_RegisterBuddyList_Call{Call: _e.mock.On("RegisterBuddyList", ctx, user)}
 }
 
@@ -120,7 +129,7 @@ type mockBuddyListRegistry_UnregisterBuddyList_Call struct {
 // UnregisterBuddyList is a helper method to define mock.On call
 //   - ctx context.Context
 //   - user state.IdentScreenName
-func (_e *mockBuddyListRegistry_Expecter) UnregisterBuddyList(ctx interface{}, user interface{}) *mockBuddyListRegistry_UnregisterBuddyList_Call {
+func (_e *mockBuddyListRegistry_Expecter) UnregisterBuddyList(ctx any, user any) *mockBuddyListRegistry_UnregisterBuddyList_Call {
 	return &mockBuddyListRegistry_UnregisterBuddyList_Call{Call: _e.mock.On("UnregisterBuddyList", ctx, user)}
 }
 

server/toc/mock_buddy_service_test.go

@@ -18,10 +18,19 @@ func newMockBuddyService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockBuddyService_AddBuddies_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x03_0x04_BuddyAddBuddies
-func (_e *mockBuddyService_Expecter) AddBuddies(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockBuddyService_AddBuddies_Call {
+func (_e *mockBuddyService_Expecter) AddBuddies(ctx any, instance any, inFrame any, inBody any) *mockBuddyService_AddBuddies_Call {
 	return &mockBuddyService_AddBuddies_Call{Call: _e.mock.On("AddBuddies", ctx, instance, inFrame, inBody)}
 }
 
@@ -145,7 +154,7 @@ type mockBuddyService_BroadcastBuddyArrived_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - userInfo wire.TLVUserInfo
-func (_e *mockBuddyService_Expecter) BroadcastBuddyArrived(ctx interface{}, screenName interface{}, userInfo interface{}) *mockBuddyService_BroadcastBuddyArrived_Call {
+func (_e *mockBuddyService_Expecter) BroadcastBuddyArrived(ctx any, screenName any, userInfo any) *mockBuddyService_BroadcastBuddyArrived_Call {
 	return &mockBuddyService_BroadcastBuddyArrived_Call{Call: _e.mock.On("BroadcastBuddyArrived", ctx, screenName, userInfo)}
 }
 
@@ -207,7 +216,7 @@ type mockBuddyService_BroadcastBuddyDeparted_Call struct {
 // BroadcastBuddyDeparted is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockBuddyService_Expecter) BroadcastBuddyDeparted(ctx interface{}, screenName interface{}) *mockBuddyService_BroadcastBuddyDeparted_Call {
+func (_e *mockBuddyService_Expecter) BroadcastBuddyDeparted(ctx any, screenName any) *mockBuddyService_BroadcastBuddyDeparted_Call {
 	return &mockBuddyService_BroadcastBuddyDeparted_Call{Call: _e.mock.On("BroadcastBuddyDeparted", ctx, screenName)}
 }
 
@@ -265,7 +274,7 @@ type mockBuddyService_DelBuddies_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x03_0x05_BuddyDelBuddies
-func (_e *mockBuddyService_Expecter) DelBuddies(ctx interface{}, instance interface{}, inBody interface{}) *mockBuddyService_DelBuddies_Call {
+func (_e *mockBuddyService_Expecter) DelBuddies(ctx any, instance any, inBody any) *mockBuddyService_DelBuddies_Call {
 	return &mockBuddyService_DelBuddies_Call{Call: _e.mock.On("DelBuddies", ctx, instance, inBody)}
 }
 
@@ -327,7 +336,7 @@ type mockBuddyService_RightsQuery_Call struct {
 // RightsQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockBuddyService_Expecter) RightsQuery(ctx interface{}, inFrame interface{}) *mockBuddyService_RightsQuery_Call {
+func (_e *mockBuddyService_Expecter) RightsQuery(ctx any, inFrame any) *mockBuddyService_RightsQuery_Call {
 	return &mockBuddyService_RightsQuery_Call{Call: _e.mock.On("RightsQuery", ctx, inFrame)}
 }
 

server/toc/mock_chat_nav_service_test.go

@@ -18,10 +18,19 @@ func newMockChatNavService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatNavService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatNavService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockChatNavService_CreateRoom_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0E_0x02_ChatRoomInfoUpdate
-func (_e *mockChatNavService_Expecter) CreateRoom(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockChatNavService_CreateRoom_Call {
+func (_e *mockChatNavService_Expecter) CreateRoom(ctx any, instance any, inFrame any, inBody any) *mockChatNavService_CreateRoom_Call {
 	return &mockChatNavService_CreateRoom_Call{Call: _e.mock.On("CreateRoom", ctx, instance, inFrame, inBody)}
 }
 
@@ -152,7 +161,7 @@ type mockChatNavService_ExchangeInfo_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0D_0x03_ChatNavRequestExchangeInfo
-func (_e *mockChatNavService_Expecter) ExchangeInfo(ctx interface{}, inFrame interface{}, inBody interface{}) *mockChatNavService_ExchangeInfo_Call {
+func (_e *mockChatNavService_Expecter) ExchangeInfo(ctx any, inFrame any, inBody any) *mockChatNavService_ExchangeInfo_Call {
 	return &mockChatNavService_ExchangeInfo_Call{Call: _e.mock.On("ExchangeInfo", ctx, inFrame, inBody)}
 }
 
@@ -214,7 +223,7 @@ type mockChatNavService_RequestChatRights_Call struct {
 // RequestChatRights is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockChatNavService_Expecter) RequestChatRights(ctx interface{}, inFrame interface{}) *mockChatNavService_RequestChatRights_Call {
+func (_e *mockChatNavService_Expecter) RequestChatRights(ctx any, inFrame any) *mockChatNavService_RequestChatRights_Call {
 	return &mockChatNavService_RequestChatRights_Call{Call: _e.mock.On("RequestChatRights", ctx, inFrame)}
 }
 
@@ -281,7 +290,7 @@ type mockChatNavService_RequestRoomInfo_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0D_0x04_ChatNavRequestRoomInfo
-func (_e *mockChatNavService_Expecter) RequestRoomInfo(ctx interface{}, inFrame interface{}, inBody interface{}) *mockChatNavService_RequestRoomInfo_Call {
+func (_e *mockChatNavService_Expecter) RequestRoomInfo(ctx any, inFrame any, inBody any) *mockChatNavService_RequestRoomInfo_Call {
 	return &mockChatNavService_RequestRoomInfo_Call{Call: _e.mock.On("RequestRoomInfo", ctx, inFrame, inBody)}
 }
 

server/toc/mock_chat_service_test.go

@@ -18,10 +18,19 @@ func newMockChatService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockChatService_ChannelMsgToHost_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0E_0x05_ChatChannelMsgToHost
-func (_e *mockChatService_Expecter) ChannelMsgToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockChatService_ChannelMsgToHost_Call {
+func (_e *mockChatService_Expecter) ChannelMsgToHost(ctx any, instance any, inFrame any, inBody any) *mockChatService_ChannelMsgToHost_Call {
 	return &mockChatService_ChannelMsgToHost_Call{Call: _e.mock.On("ChannelMsgToHost", ctx, instance, inFrame, inBody)}
 }
 

server/toc/mock_chat_session_manager_test.go

@@ -15,10 +15,19 @@ func newMockChatSessionManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockChatSessionManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockChatSessionManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -49,7 +58,7 @@ type mockChatSessionManager_RemoveUserFromAllChats_Call struct {
 
 // RemoveUserFromAllChats is a helper method to define mock.On call
 //   - user state.IdentScreenName
-func (_e *mockChatSessionManager_Expecter) RemoveUserFromAllChats(user interface{}) *mockChatSessionManager_RemoveUserFromAllChats_Call {
+func (_e *mockChatSessionManager_Expecter) RemoveUserFromAllChats(user any) *mockChatSessionManager_RemoveUserFromAllChats_Call {
 	return &mockChatSessionManager_RemoveUserFromAllChats_Call{Call: _e.mock.On("RemoveUserFromAllChats", user)}
 }
 

server/toc/mock_cookie_baker_test.go

@@ -16,10 +16,19 @@ func newMockCookieBaker(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockCookieBaker {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockCookieBaker{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -78,7 +87,7 @@ type mockCookieBaker_Crack_Call struct {
 
 // Crack is a helper method to define mock.On call
 //   - data []byte
-func (_e *mockCookieBaker_Expecter) Crack(data interface{}) *mockCookieBaker_Crack_Call {
+func (_e *mockCookieBaker_Expecter) Crack(data any) *mockCookieBaker_Crack_Call {
 	return &mockCookieBaker_Crack_Call{Call: _e.mock.On("Crack", data)}
 }
 
@@ -141,7 +150,7 @@ type mockCookieBaker_Issue_Call struct {
 // Issue is a helper method to define mock.On call
 //   - data []byte
 //   - ttl time.Duration
-func (_e *mockCookieBaker_Expecter) Issue(data interface{}, ttl interface{}) *mockCookieBaker_Issue_Call {
+func (_e *mockCookieBaker_Expecter) Issue(data any, ttl any) *mockCookieBaker_Issue_Call {
 	return &mockCookieBaker_Issue_Call{Call: _e.mock.On("Issue", data, ttl)}
 }
 

server/toc/mock_dir_search_service_test.go

@@ -17,10 +17,19 @@ func newMockDirSearchService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockDirSearchService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockDirSearchService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockDirSearchService_InfoQuery_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0F_0x02_InfoQuery
-func (_e *mockDirSearchService_Expecter) InfoQuery(ctx interface{}, inFrame interface{}, inBody interface{}) *mockDirSearchService_InfoQuery_Call {
+func (_e *mockDirSearchService_Expecter) InfoQuery(ctx any, inFrame any, inBody any) *mockDirSearchService_InfoQuery_Call {
 	return &mockDirSearchService_InfoQuery_Call{Call: _e.mock.On("InfoQuery", ctx, inFrame, inBody)}
 }
 

server/toc/mock_feedbag_manager_test.go

@@ -18,10 +18,19 @@ func newMockFeedbagManager(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockFeedbagManager {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockFeedbagManager{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockFeedbagManager_Feedbag_Call struct {
 // Feedbag is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockFeedbagManager_Expecter) Feedbag(ctx interface{}, screenName interface{}) *mockFeedbagManager_Feedbag_Call {
+func (_e *mockFeedbagManager_Expecter) Feedbag(ctx any, screenName any) *mockFeedbagManager_Feedbag_Call {
 	return &mockFeedbagManager_Feedbag_Call{Call: _e.mock.On("Feedbag", ctx, screenName)}
 }
 
@@ -132,7 +141,7 @@ type mockFeedbagManager_UseFeedbag_Call struct {
 // UseFeedbag is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockFeedbagManager_Expecter) UseFeedbag(ctx interface{}, screenName interface{}) *mockFeedbagManager_UseFeedbag_Call {
+func (_e *mockFeedbagManager_Expecter) UseFeedbag(ctx any, screenName any) *mockFeedbagManager_UseFeedbag_Call {
 	return &mockFeedbagManager_UseFeedbag_Call{Call: _e.mock.On("UseFeedbag", ctx, screenName)}
 }
 

server/toc/mock_feedbag_service_test.go

@@ -18,10 +18,19 @@ func newMockFeedbagService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockFeedbagService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockFeedbagService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockFeedbagService_DeleteItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x0A_FeedbagDeleteItem
-func (_e *mockFeedbagService_Expecter) DeleteItem(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_DeleteItem_Call {
+func (_e *mockFeedbagService_Expecter) DeleteItem(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_DeleteItem_Call {
 	return &mockFeedbagService_DeleteItem_Call{Call: _e.mock.On("DeleteItem", ctx, instance, inFrame, inBody)}
 }
 
@@ -145,7 +154,7 @@ type mockFeedbagService_EndCluster_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockFeedbagService_Expecter) EndCluster(ctx interface{}, instance interface{}, inFrame interface{}) *mockFeedbagService_EndCluster_Call {
+func (_e *mockFeedbagService_Expecter) EndCluster(ctx any, instance any, inFrame any) *mockFeedbagService_EndCluster_Call {
 	return &mockFeedbagService_EndCluster_Call{Call: _e.mock.On("EndCluster", ctx, instance, inFrame)}
 }
 
@@ -217,7 +226,7 @@ type mockFeedbagService_Query_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockFeedbagService_Expecter) Query(ctx interface{}, instance interface{}, inFrame interface{}) *mockFeedbagService_Query_Call {
+func (_e *mockFeedbagService_Expecter) Query(ctx any, instance any, inFrame any) *mockFeedbagService_Query_Call {
 	return &mockFeedbagService_Query_Call{Call: _e.mock.On("Query", ctx, instance, inFrame)}
 }
 
@@ -290,7 +299,7 @@ type mockFeedbagService_QueryIfModified_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x05_FeedbagQueryIfModified
-func (_e *mockFeedbagService_Expecter) QueryIfModified(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_QueryIfModified_Call {
+func (_e *mockFeedbagService_Expecter) QueryIfModified(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_QueryIfModified_Call {
 	return &mockFeedbagService_QueryIfModified_Call{Call: _e.mock.On("QueryIfModified", ctx, instance, inFrame, inBody)}
 }
 
@@ -359,7 +368,7 @@ type mockFeedbagService_RespondAuthorizeToHost_Call struct {
 //   - instance state.IdentScreenName
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x1A_FeedbagRespondAuthorizeToHost
-func (_e *mockFeedbagService_Expecter) RespondAuthorizeToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_RespondAuthorizeToHost_Call {
+func (_e *mockFeedbagService_Expecter) RespondAuthorizeToHost(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_RespondAuthorizeToHost_Call {
 	return &mockFeedbagService_RespondAuthorizeToHost_Call{Call: _e.mock.On("RespondAuthorizeToHost", ctx, instance, inFrame, inBody)}
 }
 
@@ -426,7 +435,7 @@ type mockFeedbagService_RightsQuery_Call struct {
 // RightsQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockFeedbagService_Expecter) RightsQuery(ctx interface{}, inFrame interface{}) *mockFeedbagService_RightsQuery_Call {
+func (_e *mockFeedbagService_Expecter) RightsQuery(ctx any, inFrame any) *mockFeedbagService_RightsQuery_Call {
 	return &mockFeedbagService_RightsQuery_Call{Call: _e.mock.On("RightsQuery", ctx, inFrame)}
 }
 
@@ -474,7 +483,7 @@ type mockFeedbagService_StartCluster_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x11_FeedbagStartCluster
-func (_e *mockFeedbagService_Expecter) StartCluster(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_StartCluster_Call {
+func (_e *mockFeedbagService_Expecter) StartCluster(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_StartCluster_Call {
 	return &mockFeedbagService_StartCluster_Call{Call: _e.mock.On("StartCluster", ctx, instance, inFrame, inBody)}
 }
 
@@ -554,7 +563,7 @@ type mockFeedbagService_UpsertItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - items []wire.FeedbagItem
-func (_e *mockFeedbagService_Expecter) UpsertItem(ctx interface{}, instance interface{}, inFrame interface{}, items interface{}) *mockFeedbagService_UpsertItem_Call {
+func (_e *mockFeedbagService_Expecter) UpsertItem(ctx any, instance any, inFrame any, items any) *mockFeedbagService_UpsertItem_Call {
 	return &mockFeedbagService_UpsertItem_Call{Call: _e.mock.On("UpsertItem", ctx, instance, inFrame, items)}
 }
 
@@ -621,7 +630,7 @@ type mockFeedbagService_Use_Call struct {
 // Use is a helper method to define mock.On call
 //   - ctx context.Context
 //   - instance *state.SessionInstance
-func (_e *mockFeedbagService_Expecter) Use(ctx interface{}, instance interface{}) *mockFeedbagService_Use_Call {
+func (_e *mockFeedbagService_Expecter) Use(ctx any, instance any) *mockFeedbagService_Use_Call {
 	return &mockFeedbagService_Use_Call{Call: _e.mock.On("Use", ctx, instance)}
 }
 

server/toc/mock_icbm_service_test.go

@@ -18,10 +18,19 @@ func newMockICBMService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICBMService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICBMService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockICBMService_ChannelMsgToHost_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x06_ICBMChannelMsgToHost
-func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ChannelMsgToHost_Call {
+func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ChannelMsgToHost_Call {
 	return &mockICBMService_ChannelMsgToHost_Call{Call: _e.mock.On("ChannelMsgToHost", ctx, instance, inFrame, inBody)}
 }
 
@@ -146,7 +155,7 @@ type mockICBMService_ClientErr_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x0B_ICBMClientErr
-func (_e *mockICBMService_Expecter) ClientErr(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ClientErr_Call {
+func (_e *mockICBMService_Expecter) ClientErr(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ClientErr_Call {
 	return &mockICBMService_ClientErr_Call{Call: _e.mock.On("ClientErr", ctx, instance, inFrame, inBody)}
 }
 
@@ -215,7 +224,7 @@ type mockICBMService_ClientEvent_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x14_ICBMClientEvent
-func (_e *mockICBMService_Expecter) ClientEvent(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ClientEvent_Call {
+func (_e *mockICBMService_Expecter) ClientEvent(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ClientEvent_Call {
 	return &mockICBMService_ClientEvent_Call{Call: _e.mock.On("ClientEvent", ctx, instance, inFrame, inBody)}
 }
 
@@ -293,7 +302,7 @@ type mockICBMService_EvilRequest_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x08_ICBMEvilRequest
-func (_e *mockICBMService_Expecter) EvilRequest(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_EvilRequest_Call {
+func (_e *mockICBMService_Expecter) EvilRequest(ctx any, instance any, inFrame any, inBody any) *mockICBMService_EvilRequest_Call {
 	return &mockICBMService_EvilRequest_Call{Call: _e.mock.On("EvilRequest", ctx, instance, inFrame, inBody)}
 }
 
@@ -360,7 +369,7 @@ type mockICBMService_ParameterQuery_Call struct {
 // ParameterQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockICBMService_Expecter) ParameterQuery(ctx interface{}, inFrame interface{}) *mockICBMService_ParameterQuery_Call {
+func (_e *mockICBMService_Expecter) ParameterQuery(ctx any, inFrame any) *mockICBMService_ParameterQuery_Call {
 	return &mockICBMService_ParameterQuery_Call{Call: _e.mock.On("ParameterQuery", ctx, inFrame)}
 }
 

server/toc/mock_locate_service_test.go

@@ -18,10 +18,19 @@ func newMockLocateService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockLocateService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockLocateService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockLocateService_DirInfo_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x0B_LocateGetDirInfo
-func (_e *mockLocateService_Expecter) DirInfo(ctx interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_DirInfo_Call {
+func (_e *mockLocateService_Expecter) DirInfo(ctx any, inFrame any, inBody any) *mockLocateService_DirInfo_Call {
 	return &mockLocateService_DirInfo_Call{Call: _e.mock.On("DirInfo", ctx, inFrame, inBody)}
 }
 
@@ -147,7 +156,7 @@ type mockLocateService_SetDirInfo_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x09_LocateSetDirInfo
-func (_e *mockLocateService_Expecter) SetDirInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_SetDirInfo_Call {
+func (_e *mockLocateService_Expecter) SetDirInfo(ctx any, instance any, inFrame any, inBody any) *mockLocateService_SetDirInfo_Call {
 	return &mockLocateService_SetDirInfo_Call{Call: _e.mock.On("SetDirInfo", ctx, instance, inFrame, inBody)}
 }
 
@@ -215,7 +224,7 @@ type mockLocateService_SetInfo_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x02_0x04_LocateSetInfo
-func (_e *mockLocateService_Expecter) SetInfo(ctx interface{}, instance interface{}, inBody interface{}) *mockLocateService_SetInfo_Call {
+func (_e *mockLocateService_Expecter) SetInfo(ctx any, instance any, inBody any) *mockLocateService_SetInfo_Call {
 	return &mockLocateService_SetInfo_Call{Call: _e.mock.On("SetInfo", ctx, instance, inBody)}
 }
 
@@ -288,7 +297,7 @@ type mockLocateService_UserInfoQuery_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x05_LocateUserInfoQuery
-func (_e *mockLocateService_Expecter) UserInfoQuery(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_UserInfoQuery_Call {
+func (_e *mockLocateService_Expecter) UserInfoQuery(ctx any, instance any, inFrame any, inBody any) *mockLocateService_UserInfoQuery_Call {
 	return &mockLocateService_UserInfoQuery_Call{Call: _e.mock.On("UserInfoQuery", ctx, instance, inFrame, inBody)}
 }
 

server/toc/mock_oservice_service_test.go

@@ -19,10 +19,19 @@ func newMockOServiceService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockOServiceService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockOServiceService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -67,7 +76,7 @@ type mockOServiceService_ClientOnline_Call struct {
 //   - service uint16
 //   - inBody wire.SNAC_0x01_0x02_OServiceClientOnline
 //   - instance *state.SessionInstance
-func (_e *mockOServiceService_Expecter) ClientOnline(ctx interface{}, service interface{}, inBody interface{}, instance interface{}) *mockOServiceService_ClientOnline_Call {
+func (_e *mockOServiceService_Expecter) ClientOnline(ctx any, service any, inBody any, instance any) *mockOServiceService_ClientOnline_Call {
 	return &mockOServiceService_ClientOnline_Call{Call: _e.mock.On("ClientOnline", ctx, service, inBody, instance)}
 }
 
@@ -135,7 +144,7 @@ type mockOServiceService_IdleNotification_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x01_0x11_OServiceIdleNotification
-func (_e *mockOServiceService_Expecter) IdleNotification(ctx interface{}, instance interface{}, inBody interface{}) *mockOServiceService_IdleNotification_Call {
+func (_e *mockOServiceService_Expecter) IdleNotification(ctx any, instance any, inBody any) *mockOServiceService_IdleNotification_Call {
 	return &mockOServiceService_IdleNotification_Call{Call: _e.mock.On("IdleNotification", ctx, instance, inBody)}
 }
 
@@ -186,7 +195,7 @@ type mockOServiceService_MonitorRateLimits_Call struct {
 // MonitorRateLimits is a helper method to define mock.On call
 //   - ctx context.Context
 //   - session *state.Session
-func (_e *mockOServiceService_Expecter) MonitorRateLimits(ctx interface{}, session interface{}) *mockOServiceService_MonitorRateLimits_Call {
+func (_e *mockOServiceService_Expecter) MonitorRateLimits(ctx any, session any) *mockOServiceService_MonitorRateLimits_Call {
 	return &mockOServiceService_MonitorRateLimits_Call{Call: _e.mock.On("MonitorRateLimits", ctx, session)}
 }
 
@@ -256,7 +265,7 @@ type mockOServiceService_ServiceRequest_Call struct {
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x01_0x04_OServiceServiceRequest
 //   - listenerGroup config.ListenerGroup
-func (_e *mockOServiceService_Expecter) ServiceRequest(ctx interface{}, service interface{}, instance interface{}, inFrame interface{}, inBody interface{}, listenerGroup interface{}) *mockOServiceService_ServiceRequest_Call {
+func (_e *mockOServiceService_Expecter) ServiceRequest(ctx any, service any, instance any, inFrame any, inBody any, listenerGroup any) *mockOServiceService_ServiceRequest_Call {
 	return &mockOServiceService_ServiceRequest_Call{Call: _e.mock.On("ServiceRequest", ctx, service, instance, inFrame, inBody, listenerGroup)}
 }
 

server/toc/mock_permit_deny_service_test.go

@@ -18,10 +18,19 @@ func newMockPermitDenyService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockPermitDenyService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockPermitDenyService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockPermitDenyService_AddDenyListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x07_PermitDenyAddDenyListEntries
-func (_e *mockPermitDenyService_Expecter) AddDenyListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_AddDenyListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) AddDenyListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_AddDenyListEntries_Call {
 	return &mockPermitDenyService_AddDenyListEntries_Call{Call: _e.mock.On("AddDenyListEntries", ctx, instance, inBody)}
 }
 
@@ -128,7 +137,7 @@ type mockPermitDenyService_AddPermListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x05_PermitDenyAddPermListEntries
-func (_e *mockPermitDenyService_Expecter) AddPermListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_AddPermListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) AddPermListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_AddPermListEntries_Call {
 	return &mockPermitDenyService_AddPermListEntries_Call{Call: _e.mock.On("AddPermListEntries", ctx, instance, inBody)}
 }
 
@@ -191,7 +200,7 @@ type mockPermitDenyService_DelDenyListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x08_PermitDenyDelDenyListEntries
-func (_e *mockPermitDenyService_Expecter) DelDenyListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_DelDenyListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) DelDenyListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_DelDenyListEntries_Call {
 	return &mockPermitDenyService_DelDenyListEntries_Call{Call: _e.mock.On("DelDenyListEntries", ctx, instance, inBody)}
 }
 
@@ -254,7 +263,7 @@ type mockPermitDenyService_DelPermListEntries_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x09_0x06_PermitDenyDelPermListEntries
-func (_e *mockPermitDenyService_Expecter) DelPermListEntries(ctx interface{}, instance interface{}, inBody interface{}) *mockPermitDenyService_DelPermListEntries_Call {
+func (_e *mockPermitDenyService_Expecter) DelPermListEntries(ctx any, instance any, inBody any) *mockPermitDenyService_DelPermListEntries_Call {
 	return &mockPermitDenyService_DelPermListEntries_Call{Call: _e.mock.On("DelPermListEntries", ctx, instance, inBody)}
 }
 
@@ -316,7 +325,7 @@ type mockPermitDenyService_RightsQuery_Call struct {
 // RightsQuery is a helper method to define mock.On call
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
-func (_e *mockPermitDenyService_Expecter) RightsQuery(ctx interface{}, inFrame interface{}) *mockPermitDenyService_RightsQuery_Call {
+func (_e *mockPermitDenyService_Expecter) RightsQuery(ctx any, inFrame any) *mockPermitDenyService_RightsQuery_Call {
 	return &mockPermitDenyService_RightsQuery_Call{Call: _e.mock.On("RightsQuery", ctx, inFrame)}
 }
 

server/toc/mock_session_retriever_test.go

@@ -15,10 +15,19 @@ func newMockSessionRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockSessionRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockSessionRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -62,7 +71,7 @@ type mockSessionRetriever_RetrieveSession_Call struct {
 
 // RetrieveSession is a helper method to define mock.On call
 //   - screenName state.IdentScreenName
-func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName interface{}) *mockSessionRetriever_RetrieveSession_Call {
+func (_e *mockSessionRetriever_Expecter) RetrieveSession(screenName any) *mockSessionRetriever_RetrieveSession_Call {
 	return &mockSessionRetriever_RetrieveSession_Call{Call: _e.mock.On("RetrieveSession", screenName)}
 }
 

server/toc/mock_toc_config_store_test.go

@@ -17,10 +17,19 @@ func newMockTOCConfigStore(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockTOCConfigStore {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockTOCConfigStore{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -64,7 +73,7 @@ type mockTOCConfigStore_SetTOCConfig_Call struct {
 //   - ctx context.Context
 //   - user state.IdentScreenName
 //   - config string
-func (_e *mockTOCConfigStore_Expecter) SetTOCConfig(ctx interface{}, user interface{}, config interface{}) *mockTOCConfigStore_SetTOCConfig_Call {
+func (_e *mockTOCConfigStore_Expecter) SetTOCConfig(ctx any, user any, config any) *mockTOCConfigStore_SetTOCConfig_Call {
 	return &mockTOCConfigStore_SetTOCConfig_Call{Call: _e.mock.On("SetTOCConfig", ctx, user, config)}
 }
 
@@ -137,7 +146,7 @@ type mockTOCConfigStore_User_Call struct {
 // User is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockTOCConfigStore_Expecter) User(ctx interface{}, screenName interface{}) *mockTOCConfigStore_User_Call {
+func (_e *mockTOCConfigStore_Expecter) User(ctx any, screenName any) *mockTOCConfigStore_User_Call {
 	return &mockTOCConfigStore_User_Call{Call: _e.mock.On("User", ctx, screenName)}
 }
 

server/webapi/mock_bart_service_test.go

@@ -18,10 +18,19 @@ func newMockBARTService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBARTService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBARTService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockBARTService_RetrieveItem_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x10_0x04_BARTDownloadQuery
-func (_e *mockBARTService_Expecter) RetrieveItem(ctx interface{}, inFrame interface{}, inBody interface{}) *mockBARTService_RetrieveItem_Call {
+func (_e *mockBARTService_Expecter) RetrieveItem(ctx any, inFrame any, inBody any) *mockBARTService_RetrieveItem_Call {
 	return &mockBARTService_RetrieveItem_Call{Call: _e.mock.On("RetrieveItem", ctx, inFrame, inBody)}
 }
 
@@ -147,7 +156,7 @@ type mockBARTService_UpsertItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x10_0x02_BARTUploadQuery
-func (_e *mockBARTService_Expecter) UpsertItem(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockBARTService_UpsertItem_Call {
+func (_e *mockBARTService_Expecter) UpsertItem(ctx any, instance any, inFrame any, inBody any) *mockBARTService_UpsertItem_Call {
 	return &mockBARTService_UpsertItem_Call{Call: _e.mock.On("UpsertItem", ctx, instance, inFrame, inBody)}
 }
 

server/webapi/mock_buddy_broadcaster_test.go

@@ -18,10 +18,19 @@ func newMockBuddyBroadcaster(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyBroadcaster {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyBroadcaster{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -65,7 +74,7 @@ type mockBuddyBroadcaster_BroadcastBuddyArrived_Call struct {
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
 //   - userInfo wire.TLVUserInfo
-func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyArrived(ctx interface{}, screenName interface{}, userInfo interface{}) *mockBuddyBroadcaster_BroadcastBuddyArrived_Call {
+func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyArrived(ctx any, screenName any, userInfo any) *mockBuddyBroadcaster_BroadcastBuddyArrived_Call {
 	return &mockBuddyBroadcaster_BroadcastBuddyArrived_Call{Call: _e.mock.On("BroadcastBuddyArrived", ctx, screenName, userInfo)}
 }
 
@@ -127,7 +136,7 @@ type mockBuddyBroadcaster_BroadcastBuddyDeparted_Call struct {
 // BroadcastBuddyDeparted is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyDeparted(ctx interface{}, screenName interface{}) *mockBuddyBroadcaster_BroadcastBuddyDeparted_Call {
+func (_e *mockBuddyBroadcaster_Expecter) BroadcastBuddyDeparted(ctx any, screenName any) *mockBuddyBroadcaster_BroadcastBuddyDeparted_Call {
 	return &mockBuddyBroadcaster_BroadcastBuddyDeparted_Call{Call: _e.mock.On("BroadcastBuddyDeparted", ctx, screenName)}
 }
 

server/webapi/mock_buddy_icon_retriever_test.go

@@ -18,10 +18,19 @@ func newMockBuddyIconRetriever(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyIconRetriever {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyIconRetriever{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -75,7 +84,7 @@ type mockBuddyIconRetriever_BuddyIconMetadata_Call struct {
 // BuddyIconMetadata is a helper method to define mock.On call
 //   - ctx context.Context
 //   - screenName state.IdentScreenName
-func (_e *mockBuddyIconRetriever_Expecter) BuddyIconMetadata(ctx interface{}, screenName interface{}) *mockBuddyIconRetriever_BuddyIconMetadata_Call {
+func (_e *mockBuddyIconRetriever_Expecter) BuddyIconMetadata(ctx any, screenName any) *mockBuddyIconRetriever_BuddyIconMetadata_Call {
 	return &mockBuddyIconRetriever_BuddyIconMetadata_Call{Call: _e.mock.On("BuddyIconMetadata", ctx, screenName)}
 }
 

server/webapi/mock_buddy_service_test.go

@@ -18,10 +18,19 @@ func newMockBuddyService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockBuddyService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockBuddyService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockBuddyService_AddTempBuddies_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x03_0x0F_BuddyAddTempBuddies
-func (_e *mockBuddyService_Expecter) AddTempBuddies(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockBuddyService_AddTempBuddies_Call {
+func (_e *mockBuddyService_Expecter) AddTempBuddies(ctx any, instance any, inFrame any, inBody any) *mockBuddyService_AddTempBuddies_Call {
 	return &mockBuddyService_AddTempBuddies_Call{Call: _e.mock.On("AddTempBuddies", ctx, instance, inFrame, inBody)}
 }
 
@@ -145,7 +154,7 @@ type mockBuddyService_DelTempBuddies_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x03_0x10_BuddyDelTempBuddies
-func (_e *mockBuddyService_Expecter) DelTempBuddies(ctx interface{}, instance interface{}, inBody interface{}) *mockBuddyService_DelTempBuddies_Call {
+func (_e *mockBuddyService_Expecter) DelTempBuddies(ctx any, instance any, inBody any) *mockBuddyService_DelTempBuddies_Call {
 	return &mockBuddyService_DelTempBuddies_Call{Call: _e.mock.On("DelTempBuddies", ctx, instance, inBody)}
 }
 

server/webapi/mock_dir_search_service_test.go

@@ -17,10 +17,19 @@ func newMockDirSearchService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockDirSearchService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockDirSearchService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockDirSearchService_InfoQuery_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x0F_0x02_InfoQuery
-func (_e *mockDirSearchService_Expecter) InfoQuery(ctx interface{}, inFrame interface{}, inBody interface{}) *mockDirSearchService_InfoQuery_Call {
+func (_e *mockDirSearchService_Expecter) InfoQuery(ctx any, inFrame any, inBody any) *mockDirSearchService_InfoQuery_Call {
 	return &mockDirSearchService_InfoQuery_Call{Call: _e.mock.On("InfoQuery", ctx, inFrame, inBody)}
 }
 

server/webapi/mock_feedbag_service_test.go

@@ -18,10 +18,19 @@ func newMockFeedbagService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockFeedbagService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockFeedbagService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockFeedbagService_DeleteItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x0A_FeedbagDeleteItem
-func (_e *mockFeedbagService_Expecter) DeleteItem(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_DeleteItem_Call {
+func (_e *mockFeedbagService_Expecter) DeleteItem(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_DeleteItem_Call {
 	return &mockFeedbagService_DeleteItem_Call{Call: _e.mock.On("DeleteItem", ctx, instance, inFrame, inBody)}
 }
 
@@ -157,7 +166,7 @@ type mockFeedbagService_PreAuthorizeBuddy_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x13_0x14_FeedbagPreAuthorizeBuddy
-func (_e *mockFeedbagService_Expecter) PreAuthorizeBuddy(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockFeedbagService_PreAuthorizeBuddy_Call {
+func (_e *mockFeedbagService_Expecter) PreAuthorizeBuddy(ctx any, instance any, inFrame any, inBody any) *mockFeedbagService_PreAuthorizeBuddy_Call {
 	return &mockFeedbagService_PreAuthorizeBuddy_Call{Call: _e.mock.On("PreAuthorizeBuddy", ctx, instance, inFrame, inBody)}
 }
 
@@ -234,7 +243,7 @@ type mockFeedbagService_Query_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockFeedbagService_Expecter) Query(ctx interface{}, instance interface{}, inFrame interface{}) *mockFeedbagService_Query_Call {
+func (_e *mockFeedbagService_Expecter) Query(ctx any, instance any, inFrame any) *mockFeedbagService_Query_Call {
 	return &mockFeedbagService_Query_Call{Call: _e.mock.On("Query", ctx, instance, inFrame)}
 }
 
@@ -309,7 +318,7 @@ type mockFeedbagService_UpsertItem_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - items []wire.FeedbagItem
-func (_e *mockFeedbagService_Expecter) UpsertItem(ctx interface{}, instance interface{}, inFrame interface{}, items interface{}) *mockFeedbagService_UpsertItem_Call {
+func (_e *mockFeedbagService_Expecter) UpsertItem(ctx any, instance any, inFrame any, items any) *mockFeedbagService_UpsertItem_Call {
 	return &mockFeedbagService_UpsertItem_Call{Call: _e.mock.On("UpsertItem", ctx, instance, inFrame, items)}
 }
 
@@ -376,7 +385,7 @@ type mockFeedbagService_Use_Call struct {
 // Use is a helper method to define mock.On call
 //   - ctx context.Context
 //   - instance *state.SessionInstance
-func (_e *mockFeedbagService_Expecter) Use(ctx interface{}, instance interface{}) *mockFeedbagService_Use_Call {
+func (_e *mockFeedbagService_Expecter) Use(ctx any, instance any) *mockFeedbagService_Use_Call {
 	return &mockFeedbagService_Use_Call{Call: _e.mock.On("Use", ctx, instance)}
 }
 

server/webapi/mock_icbm_service_test.go

@@ -18,10 +18,19 @@ func newMockICBMService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockICBMService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockICBMService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -77,7 +86,7 @@ type mockICBMService_ChannelMsgToHost_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x06_ICBMChannelMsgToHost
-func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ChannelMsgToHost_Call {
+func (_e *mockICBMService_Expecter) ChannelMsgToHost(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ChannelMsgToHost_Call {
 	return &mockICBMService_ChannelMsgToHost_Call{Call: _e.mock.On("ChannelMsgToHost", ctx, instance, inFrame, inBody)}
 }
 
@@ -146,7 +155,7 @@ type mockICBMService_ClientEvent_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x04_0x14_ICBMClientEvent
-func (_e *mockICBMService_Expecter) ClientEvent(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockICBMService_ClientEvent_Call {
+func (_e *mockICBMService_Expecter) ClientEvent(ctx any, instance any, inFrame any, inBody any) *mockICBMService_ClientEvent_Call {
 	return &mockICBMService_ClientEvent_Call{Call: _e.mock.On("ClientEvent", ctx, instance, inFrame, inBody)}
 }
 
@@ -223,7 +232,7 @@ type mockICBMService_OfflineRetrieve_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
-func (_e *mockICBMService_Expecter) OfflineRetrieve(ctx interface{}, instance interface{}, inFrame interface{}) *mockICBMService_OfflineRetrieve_Call {
+func (_e *mockICBMService_Expecter) OfflineRetrieve(ctx any, instance any, inFrame any) *mockICBMService_OfflineRetrieve_Call {
 	return &mockICBMService_OfflineRetrieve_Call{Call: _e.mock.On("OfflineRetrieve", ctx, instance, inFrame)}
 }
 

server/webapi/mock_locate_service_test.go

@@ -18,10 +18,19 @@ func newMockLocateService(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockLocateService {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockLocateService{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -74,7 +83,7 @@ type mockLocateService_DirInfo_Call struct {
 //   - ctx context.Context
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x0B_LocateGetDirInfo
-func (_e *mockLocateService_Expecter) DirInfo(ctx interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_DirInfo_Call {
+func (_e *mockLocateService_Expecter) DirInfo(ctx any, inFrame any, inBody any) *mockLocateService_DirInfo_Call {
 	return &mockLocateService_DirInfo_Call{Call: _e.mock.On("DirInfo", ctx, inFrame, inBody)}
 }
 
@@ -147,7 +156,7 @@ type mockLocateService_SetDirInfo_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x09_LocateSetDirInfo
-func (_e *mockLocateService_Expecter) SetDirInfo(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_SetDirInfo_Call {
+func (_e *mockLocateService_Expecter) SetDirInfo(ctx any, instance any, inFrame any, inBody any) *mockLocateService_SetDirInfo_Call {
 	return &mockLocateService_SetDirInfo_Call{Call: _e.mock.On("SetDirInfo", ctx, instance, inFrame, inBody)}
 }
 
@@ -215,7 +224,7 @@ type mockLocateService_SetInfo_Call struct {
 //   - ctx context.Context
 //   - instance *state.SessionInstance
 //   - inBody wire.SNAC_0x02_0x04_LocateSetInfo
-func (_e *mockLocateService_Expecter) SetInfo(ctx interface{}, instance interface{}, inBody interface{}) *mockLocateService_SetInfo_Call {
+func (_e *mockLocateService_Expecter) SetInfo(ctx any, instance any, inBody any) *mockLocateService_SetInfo_Call {
 	return &mockLocateService_SetInfo_Call{Call: _e.mock.On("SetInfo", ctx, instance, inBody)}
 }
 
@@ -288,7 +297,7 @@ type mockLocateService_UserInfoQuery_Call struct {
 //   - instance *state.SessionInstance
 //   - inFrame wire.SNACFrame
 //   - inBody wire.SNAC_0x02_0x05_LocateUserInfoQuery
-func (_e *mockLocateService_Expecter) UserInfoQuery(ctx interface{}, instance interface{}, inFrame interface{}, inBody interface{}) *mockLocateService_UserInfoQuery_Call {
+func (_e *mockLocateService_Expecter) UserInfoQuery(ctx any, instance any, inFrame any, inBody any) *mockLocateService_UserInfoQuery_Call {
 	return &mockLocateService_UserInfoQuery_Call{Call: _e.mock.On("UserInfoQuery", ctx, instance, inFrame, inBody)}
 }
 

server/webapi/mock_webapi_session_resolver_test.go

@@ -16,10 +16,19 @@ func newMockSessionResolver(t interface {
 	mock.TestingT
 	Cleanup(func())
 }) *mockSessionResolver {
+	if helper, ok := t.(interface{ Helper() }); ok {
+		helper.Helper()
+	}
+
 	mock := &mockSessionResolver{}
 	mock.Mock.Test(t)
 
-	t.Cleanup(func() { mock.AssertExpectations(t) })
+	t.Cleanup(func() {
+		if helper, ok := t.(interface{ Helper() }); ok {
+			helper.Helper()
+		}
+		mock.AssertExpectations(t)
+	})
 
 	return mock
 }
@@ -73,7 +82,7 @@ type mockSessionResolver_GetSession_Call struct {
 // GetSession is a helper method to define mock.On call
 //   - ctx context.Context
 //   - aimsid string
-func (_e *mockSessionResolver_Expecter) GetSession(ctx interface{}, aimsid interface{}) *mockSessionResolver_GetSession_Call {
+func (_e *mockSessionResolver_Expecter) GetSession(ctx any, aimsid any) *mockSessionResolver_GetSession_Call {
 	return &mockSessionResolver_GetSession_Call{Call: _e.mock.On("GetSession", ctx, aimsid)}
 }
 
@@ -130,7 +139,7 @@ type mockSessionResolver_TouchSession_Call struct {
 // TouchSession is a helper method to define mock.On call
 //   - ctx context.Context
 //   - aimsid string
-func (_e *mockSessionResolver_Expecter) TouchSession(ctx interface{}, aimsid interface{}) *mockSessionResolver_TouchSession_Call {
+func (_e *mockSessionResolver_Expecter) TouchSession(ctx any, aimsid any) *mockSessionResolver_TouchSession_Call {
 	return &mockSessionResolver_TouchSession_Call{Call: _e.mock.On("TouchSession", ctx, aimsid)}
 }