@@ -185,7 +185,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
185185 return nil , fmt .Errorf ("failed to include node with id %d with error: %w" , nodeID , err )
186186 }
187187
188- f .state . addNode (node )
188+ f .addNode (node )
189189 return nil , nil
190190 })
191191
@@ -206,7 +206,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
206206 // Exclude node from farmerbot management
207207 // (It is not allowed if we tried to power on a node the farmer decided to power off)
208208 // the farmer should include it again if he wants to the bot to manage it
209- f .state . deleteNode (nodeID )
209+ f .deleteNode (nodeID )
210210 return nil , nil
211211 })
212212
@@ -227,7 +227,7 @@ func (f *FarmerBot) serve(ctx context.Context) error {
227227 // Exclude node from farmerbot management
228228 // (It is not allowed if we tried to power off a node the farmer decided to power on)
229229 // the farmer should include it again if he wants to the bot to manage it
230- f .state . deleteNode (nodeID )
230+ f .deleteNode (nodeID )
231231 return nil , nil
232232 })
233233
@@ -240,7 +240,6 @@ func (f *FarmerBot) serve(ctx context.Context) error {
240240 peer .WithSession (fmt .Sprintf ("farmerbot-%d" , f .farm .ID )),
241241 peer .WithKeyType (f .keyType ),
242242 )
243-
244243 if err != nil {
245244 return fmt .Errorf ("failed to create farmerbot direct peer with error: %w" , err )
246245 }
@@ -253,28 +252,28 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
253252 var wakeUpCalls uint8
254253
255254 log .Debug ().Msg ("Fetch nodes" )
256- farmNodes , err := subConn .GetNodes (uint32 (f .state . farm .ID ))
255+ farmNodes , err := subConn .GetNodes (uint32 (f .farm .ID ))
257256 if err != nil {
258257 return err
259258 }
260259
261260 // remove nodes that don't exist anymore in the farm
262- for _ , node := range f .state . nodes {
261+ for _ , node := range f .nodes {
263262 if ! slices .Contains (farmNodes , uint32 (node .ID )) {
264- f .state . deleteNode (uint32 (node .ID ))
263+ f .deleteNode (uint32 (node .ID ))
265264 }
266265 }
267266
268- farmNodes = addPriorityToNodes (f .state . config .PriorityNodes , farmNodes )
267+ farmNodes = addPriorityToNodes (f .config .PriorityNodes , farmNodes )
269268
270269 for _ , nodeID := range farmNodes {
271- if slices .Contains (f .state . config .ExcludedNodes , nodeID ) {
270+ if slices .Contains (f .config .ExcludedNodes , nodeID ) {
272271 continue
273272 }
274273
275274 // if the user specified included nodes or
276275 // no nodes are specified so all nodes will be added (except excluded)
277- if ! slices .Contains (f .state . config .IncludedNodes , nodeID ) && len (f . state .config .IncludedNodes ) > 0 {
276+ if ! slices .Contains (f .config .IncludedNodes , nodeID ) && len (f .config .IncludedNodes ) > 0 {
278277 continue
279278 }
280279
@@ -284,7 +283,7 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
284283 log .Error ().Err (err ).Send ()
285284 }
286285
287- _ , node , err := f .state . getNode (nodeID )
286+ _ , node , err := f .getNode (nodeID )
288287 if err != nil {
289288 log .Error ().Err (err ).Send ()
290289 }
@@ -300,14 +299,14 @@ func (f *FarmerBot) iterateOnNodes(ctx context.Context, subConn Substrate) error
300299 if roundStart .Day () == 1 && roundStart .Hour () == 1 && roundStart .Minute () < int (timeoutUpdate .Minutes ()) {
301300 log .Debug ().Uint32 ("nodeID" , nodeID ).Msg ("Reset random wake-up times the first day of the month" )
302301 node .timesRandomWakeUps = 0
303- err = f .state . updateNode (node )
302+ err = f .updateNode (node )
304303 if err != nil {
305304 log .Error ().Err (err ).Send ()
306305 }
307306 }
308307
309308 if f .shouldWakeUp (ctx , & node , roundStart , wakeUpCalls ) {
310- err = f .state . updateNode (node )
309+ err = f .updateNode (node )
311310 if err != nil {
312311 log .Error ().Err (err ).Send ()
313312 }
@@ -355,14 +354,14 @@ func addPriorityToNodes(priorityNodes, farmNodes []uint32) []uint32 {
355354}
356355
357356func (f * FarmerBot ) addOrUpdateNode (ctx context.Context , subConn Substrate , nodeID uint32 ) error {
358- neverShutDown := slices .Contains (f .state . config .NeverShutDownNodes , nodeID )
357+ neverShutDown := slices .Contains (f .config .NeverShutDownNodes , nodeID )
359358
360- _ , oldNode , err := f .state . getNode (nodeID )
359+ _ , oldNode , err := f .getNode (nodeID )
361360 if err == nil { // node exists
362- updateErr := oldNode .update (ctx , subConn , f .rmbNodeClient , neverShutDown , f .state . farm .DedicatedFarm , f .config .ContinueOnPoweringOnErr )
361+ updateErr := oldNode .update (ctx , subConn , f .rmbNodeClient , neverShutDown , f .farm .DedicatedFarm , f .config .ContinueOnPoweringOnErr )
363362
364363 // update old node state even if it failed
365- if err := f .state . updateNode (oldNode ); err != nil {
364+ if err := f .updateNode (oldNode ); err != nil {
366365 return fmt .Errorf ("failed to update node state %d with error: %w" , uint32 (oldNode .ID ), err )
367366 }
368367
@@ -375,12 +374,12 @@ func (f *FarmerBot) addOrUpdateNode(ctx context.Context, subConn Substrate, node
375374 }
376375
377376 // if node doesn't exist, we should add it
378- nodeObj , err := getNode (ctx , subConn , f .rmbNodeClient , nodeID , f .config .ContinueOnPoweringOnErr , neverShutDown , false , f .state . farm .DedicatedFarm , on )
377+ nodeObj , err := getNode (ctx , subConn , f .rmbNodeClient , nodeID , f .config .ContinueOnPoweringOnErr , neverShutDown , false , f .farm .DedicatedFarm , on )
379378 if err != nil {
380379 return fmt .Errorf ("failed to get node %d: %w" , nodeID , err )
381380 }
382381
383- f .state . addNode (nodeObj )
382+ f .addNode (nodeObj )
384383 log .Debug ().Uint32 ("nodeID" , nodeID ).Msg ("Node is added with latest changes successfully" )
385384 return nil
386385}
0 commit comments