internal/rosa: pass stage alongside state

This cleans up many function signatures.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 8 insertions, 7 deletions

diff --git a/cmd/mbf/info_test.go b/cmd/mbf/info_test.go
index e3120157..87e9cdcb 100644
--- a/cmd/mbf/info_test.go
+++ b/cmd/mbf/info_test.go
@@ -21,12 +21,13 @@ import (
 func TestInfo(t *testing.T) {
 	t.Parallel()
 
-	_, qemuVersion := rosa.Native().Load(rosa.Std, rosa.QEMU)
-	_, glibVersion := rosa.Native().Load(rosa.Std, rosa.GLib)
-	zlib, zlibVersion := rosa.Native().Load(rosa.Std, rosa.Zlib)
-	_, zstdVersion := rosa.Native().Load(rosa.Std, rosa.Zstd)
-	_, hakureiVersion := rosa.Native().Load(rosa.Std, rosa.Hakurei)
-	_, hakureiDistVersion := rosa.Native().Load(rosa.Std, rosa.HakureiDist)
+	_t := rosa.Native().Std()
+	_, qemuVersion := _t.Load(rosa.QEMU)
+	_, glibVersion := _t.Load(rosa.GLib)
+	zlib, zlibVersion := _t.Load(rosa.Zlib)
+	_, zstdVersion := _t.Load(rosa.Zstd)
+	_, hakureiVersion := _t.Load(rosa.Hakurei)
+	_, hakureiDistVersion := _t.Load(rosa.HakureiDist)
 
 	testCases := []struct {
 		name    string
@@ -139,7 +140,7 @@ status      : not in report
 
 			if tc.status != nil {
 				for name, status := range tc.status {
-					a, _ := rosa.Native().Load(rosa.Std, rosa.ArtifactH(unique.Make(name)))
+					a, _ := _t.Load(rosa.ArtifactH(unique.Make(name)))
 					if a == nil {
 						t.Fatalf("invalid name %q", name)
 					}