git.iko.soy/crush
on main help sign in
fix(lint): don't shadow 'env' variable

Elsewhere in the package, many things are called env. This change renames the 'env' type used in testing to fix shadow warnings.

commitd4d331f3abbc14158adf20b6d9030de13fa7eb7e authorChristian Rocha <christian@rocha.is> dateSun 2 Nov 2025, 21:14 (1 year ago) parent98780b1
2 files changed+7−6
compare with main
unifiedsplit
internal/agent/agent_test.go+1−1 internal/agent/common_test.go+6−5
internal/agent/agent_test.go+1−1
@@ -33,7 +33,7 @@ func getModels(t *testing.T, r *recorder.Recorder, pair modelPair) (fantasy.Lang
3333 return large, small
3434}
3535
36−func setupAgent(t *testing.T, pair modelPair) (SessionAgent, env) {
36+func setupAgent(t *testing.T, pair modelPair) (SessionAgent, fakeEnv) {
3737 r := newRecorder(t)
3838 large, small := getModels(t, r, pair)
3939 env := testEnv(t)
internal/agent/common_test.go+6−5
@@ -30,7 +30,8 @@ import (
3030 _ "github.com/joho/godotenv/autoload"
3131)
3232
33−type env struct {
33+// fakeEnv is an environment for testing.
34+type fakeEnv struct {
3435 workingDir string
3536 sessions session.Service
3637 messages message.Service
@@ -100,7 +101,7 @@ func zAIBuilder(model string) builderFunc {
100101 }
101102}
102103
103−func testEnv(t *testing.T) env {
104+func testEnv(t *testing.T) fakeEnv {
104105 workingDir := filepath.Join("/tmp/crush-test/", t.Name())
105106 os.RemoveAll(workingDir)
106107
@@ -123,7 +124,7 @@ func testEnv(t *testing.T) env {
123124 os.RemoveAll(workingDir)
124125 })
125126
126− return env{
127+ return fakeEnv{
127128 workingDir,
128129 sessions,
129130 messages,
@@ -133,7 +134,7 @@ func testEnv(t *testing.T) env {
133134 }
134135}
135136
136−func testSessionAgent(env env, large, small fantasy.LanguageModel, systemPrompt string, tools ...fantasy.AgentTool) SessionAgent {
137+func testSessionAgent(env fakeEnv, large, small fantasy.LanguageModel, systemPrompt string, tools ...fantasy.AgentTool) SessionAgent {
137138 largeModel := Model{
138139 Model: large,
139140 CatwalkCfg: catwalk.Model{
@@ -152,7 +153,7 @@ func testSessionAgent(env env, large, small fantasy.LanguageModel, systemPrompt
152153 return agent
153154}
154155
155−func coderAgent(r *recorder.Recorder, env env, large, small fantasy.LanguageModel) (SessionAgent, error) {
156+func coderAgent(r *recorder.Recorder, env fakeEnv, large, small fantasy.LanguageModel) (SessionAgent, error) {
156157 fixedTime := func() time.Time {
157158 t, _ := time.Parse("1/2/2006", "1/1/2025")
158159 return t