remove unsued properties in Context

arduino · Sep 12, 2023 · 4260e03 · 4260e03
1 parent a3b9cb6
commit 4260e03
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/commands/compile/compile.go b/commands/compile/compile.go
@@ -99,7 +99,7 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 	if err != nil {
 		return nil, &arduino.InvalidFQBNError{Cause: err}
 	}
-	targetPackage, targetPlatform, targetBoard, boardBuildProperties, buildPlatform, err := pme.ResolveFQBN(fqbn)
+	_, targetPlatform, targetBoard, boardBuildProperties, buildPlatform, err := pme.ResolveFQBN(fqbn)
 	if err != nil {
 		if targetPlatform == nil {
 			return nil, &arduino.PlatformNotFoundError{
@@ -170,18 +170,14 @@ func Compile(ctx context.Context, req *rpc.CompileRequest, outStream, errStream
 		coreBuildCachePath = buildCachePath.Join("core")
 	}
 
-	requiredTools, err := pme.FindToolsRequiredForBuild(targetPlatform, buildPlatform)
-	if err != nil {
+	if _, err := pme.FindToolsRequiredForBuild(targetPlatform, buildPlatform); err != nil {
 		return nil, err
 	}
 
 	builderCtx := &types.Context{}
 	builderCtx.PackageManager = pme
-	builderCtx.TargetBoard = targetBoard
 	builderCtx.TargetPlatform = targetPlatform
-	builderCtx.TargetPackage = targetPackage
 	builderCtx.ActualPlatform = buildPlatform
-	builderCtx.RequiredTools = requiredTools
 	builderCtx.ProgressCB = progressCB
 
 	// FIXME: This will be redundant when arduino-builder will be part of the cli

diff --git a/legacy/builder/test/builder_test.go b/legacy/builder/test/builder_test.go
@@ -111,9 +111,9 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
 	require.NoError(t, err)
 	if fqbnString != "" {
 		fqbn := parseFQBN(t, fqbnString)
-		targetPackage, targetPlatform, targetBoard, boardBuildProperties, buildPlatform, err := pme.ResolveFQBN(fqbn)
+		_, targetPlatform, _, boardBuildProperties, buildPlatform, err := pme.ResolveFQBN(fqbn)
 		require.NoError(t, err)
-		requiredTools, err := pme.FindToolsRequiredForBuild(targetPlatform, buildPlatform)
+		_, err = pme.FindToolsRequiredForBuild(targetPlatform, buildPlatform)
 		require.NoError(t, err)
 
 		ctx.Builder, err = bldr.NewBuilder(
@@ -123,11 +123,8 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
 		require.NoError(t, err)
 
 		ctx.PackageManager = pme
-		ctx.TargetBoard = targetBoard
 		ctx.TargetPlatform = targetPlatform
-		ctx.TargetPackage = targetPackage
 		ctx.ActualPlatform = buildPlatform
-		ctx.RequiredTools = requiredTools
 	}
 
 	if !stepToSkip[skipLibraries] {

diff --git a/legacy/builder/types/context.go b/legacy/builder/types/context.go
@@ -41,9 +41,6 @@ type Context struct {
 	OtherLibrariesDirs   paths.PathList
 
 	PackageManager *packagemanager.Explorer
-	RequiredTools  []*cores.ToolRelease
-	TargetBoard    *cores.Board
-	TargetPackage  *cores.Package
 	TargetPlatform *cores.PlatformRelease
 	ActualPlatform *cores.PlatformRelease