Skip to content

Commit 9cc7019

Browse files
committed
supplycommit: avoid mock variable name shadowing with outer scope
1 parent d0e9b79 commit 9cc7019

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

universe/supplycommit/state_machine_test.go

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -138,37 +138,37 @@ type supplyCommitTestHarness struct {
138138
func newSupplyCommitTestHarness(t *testing.T,
139139
cfg *harnessCfg) *supplyCommitTestHarness {
140140

141-
mockTreeView := &mockSupplyTreeView{}
142-
mockCommits := &mockCommitmentTracker{}
143-
mockWallet := &mockWallet{}
144-
mockKey := &mockKeyRing{}
145-
mockChain := &mockChainBridge{}
146-
mockStateLog := &mockStateMachineStore{}
147-
mockDaemon := newMockDaemonAdapters()
148-
mockErrReporter := &mockErrorReporter{}
149-
mockCache := &mockIgnoreCheckerCache{}
150-
mockAssetLookup := &mockAssetLookup{}
151-
mockSupplySyncer := &mockSupplySyncer{}
141+
mTreeView := &mockSupplyTreeView{}
142+
mCommits := &mockCommitmentTracker{}
143+
mWallet := &mockWallet{}
144+
mKey := &mockKeyRing{}
145+
mChain := &mockChainBridge{}
146+
mStateLog := &mockStateMachineStore{}
147+
mDaemon := newMockDaemonAdapters()
148+
mErrReporter := &mockErrorReporter{}
149+
mCache := &mockIgnoreCheckerCache{}
150+
mAssetLookup := &mockAssetLookup{}
151+
mSupplySyncer := &mockSupplySyncer{}
152152

153153
env := &Environment{
154154
AssetSpec: cfg.assetSpec,
155-
TreeView: mockTreeView,
156-
Commitments: mockCommits,
157-
Wallet: mockWallet,
158-
KeyRing: mockKey,
159-
Chain: mockChain,
160-
StateLog: mockStateLog,
161-
AssetLookup: mockAssetLookup,
162-
SupplySyncer: mockSupplySyncer,
155+
TreeView: mTreeView,
156+
Commitments: mCommits,
157+
Wallet: mWallet,
158+
KeyRing: mKey,
159+
Chain: mChain,
160+
StateLog: mStateLog,
161+
AssetLookup: mAssetLookup,
162+
SupplySyncer: mSupplySyncer,
163163
CommitConfTarget: DefaultCommitConfTarget,
164-
IgnoreCheckerCache: mockCache,
164+
IgnoreCheckerCache: mCache,
165165
}
166166

167167
fsmCfg := Config{
168168
InitialState: cfg.initialState,
169169
Env: env,
170-
Daemon: mockDaemon,
171-
ErrorReporter: mockErrReporter,
170+
Daemon: mDaemon,
171+
ErrorReporter: mErrReporter,
172172
InitEvent: lfn.None[protofsm.DaemonEvent](),
173173
MsgMapper: lfn.None[protofsm.MsgMapper[Event]](),
174174
CustomPollInterval: lfn.Some(time.Second),
@@ -181,17 +181,17 @@ func newSupplyCommitTestHarness(t *testing.T,
181181
cfg: cfg,
182182
stateMachine: &stateMachine,
183183
env: env,
184-
mockTreeView: mockTreeView,
185-
mockCommits: mockCommits,
186-
mockWallet: mockWallet,
187-
mockKeyRing: mockKey,
188-
mockChain: mockChain,
189-
mockStateLog: mockStateLog,
190-
mockCache: mockCache,
191-
mockDaemon: mockDaemon,
192-
mockErrReporter: mockErrReporter,
193-
mockAssetLookup: mockAssetLookup,
194-
mockSupplySyncer: mockSupplySyncer,
184+
mockTreeView: mTreeView,
185+
mockCommits: mCommits,
186+
mockWallet: mWallet,
187+
mockKeyRing: mKey,
188+
mockChain: mChain,
189+
mockStateLog: mStateLog,
190+
mockCache: mCache,
191+
mockDaemon: mDaemon,
192+
mockErrReporter: mErrReporter,
193+
mockAssetLookup: mAssetLookup,
194+
mockSupplySyncer: mSupplySyncer,
195195
}
196196

197197
h.stateSub = stateMachine.RegisterStateEvents()

0 commit comments

Comments
 (0)