Migrate SchemeStore to sync by default (#11522)

* Migrate SchemeStore to sync by default

* Fixing tests compilation

* Fixing shadow variable

* Fixing tests

app/scheme.go

@@ -14,11 +14,7 @@ func (a *App) GetScheme(id string) (*model.Scheme, *model.AppError) {
 		return nil, err
 	}
 
-	result := <-a.Srv.Store.Scheme().Get(id)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return result.Data.(*model.Scheme), nil
+	return a.Srv.Store.Scheme().Get(id)
 }
 
 func (a *App) GetSchemeByName(name string) (*model.Scheme, *model.AppError) {
@@ -26,11 +22,7 @@ func (a *App) GetSchemeByName(name string) (*model.Scheme, *model.AppError) {
 		return nil, err
 	}
 
-	result := <-a.Srv.Store.Scheme().GetByName(name)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return result.Data.(*model.Scheme), nil
+	return a.Srv.Store.Scheme().GetByName(name)
 }
 
 func (a *App) GetSchemesPage(scope string, page int, perPage int) ([]*model.Scheme, *model.AppError) {
@@ -46,11 +38,7 @@ func (a *App) GetSchemes(scope string, offset int, limit int) ([]*model.Scheme,
 		return nil, err
 	}
 
-	result := <-a.Srv.Store.Scheme().GetAllPage(scope, offset, limit)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return result.Data.([]*model.Scheme), nil
+	return a.Srv.Store.Scheme().GetAllPage(scope, offset, limit)
 }
 
 func (a *App) CreateScheme(scheme *model.Scheme) (*model.Scheme, *model.AppError) {
@@ -69,11 +57,7 @@ func (a *App) CreateScheme(scheme *model.Scheme) (*model.Scheme, *model.AppError
 	scheme.UpdateAt = 0
 	scheme.DeleteAt = 0
 
-	result := <-a.Srv.Store.Scheme().Save(scheme)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return scheme, nil
+	return a.Srv.Store.Scheme().Save(scheme)
 }
 
 func (a *App) PatchScheme(scheme *model.Scheme, patch *model.SchemePatch) (*model.Scheme, *model.AppError) {
@@ -95,11 +79,7 @@ func (a *App) UpdateScheme(scheme *model.Scheme) (*model.Scheme, *model.AppError
 		return nil, err
 	}
 
-	result := <-a.Srv.Store.Scheme().Save(scheme)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return scheme, nil
+	return a.Srv.Store.Scheme().Save(scheme)
 }
 
 func (a *App) DeleteScheme(schemeId string) (*model.Scheme, *model.AppError) {
@@ -107,11 +87,7 @@ func (a *App) DeleteScheme(schemeId string) (*model.Scheme, *model.AppError) {
 		return nil, err
 	}
 
-	result := <-a.Srv.Store.Scheme().Delete(schemeId)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return result.Data.(*model.Scheme), nil
+	return a.Srv.Store.Scheme().Delete(schemeId)
 }
 
 func (a *App) GetTeamsForSchemePage(scheme *model.Scheme, page int, perPage int) ([]*model.Team, *model.AppError) {
@@ -166,11 +142,11 @@ func (a *App) IsPhase2MigrationCompleted() *model.AppError {
 func (a *App) SchemesIterator(batchSize int) func() []*model.Scheme {
 	offset := 0
 	return func() []*model.Scheme {
-		result := <-a.Srv.Store.Scheme().GetAllPage("", offset, batchSize)
-		if result.Err != nil {
+		schemes, err := a.Srv.Store.Scheme().GetAllPage("", offset, batchSize)
+		if err != nil {
 			return []*model.Scheme{}
 		}
 		offset += batchSize
-		return result.Data.([]*model.Scheme)
+		return schemes
 	}
 }