From 5f754c2c2252896016fd77d1fd3234a795049a0e Mon Sep 17 00:00:00 2001 From: ankur22 Date: Thu, 11 Jan 2024 11:54:07 +0000 Subject: [PATCH] Refactor found to ok Ok is more idiomatic in Go. --- common/element_handle.go | 16 ++++++++-------- common/frame.go | 4 ++-- common/frame_manager.go | 16 ++++++++-------- common/frame_session.go | 22 +++++++++++----------- common/network_manager.go | 6 +++--- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/common/element_handle.go b/common/element_handle.go index e6bf201f7..6b2b20425 100644 --- a/common/element_handle.go +++ b/common/element_handle.go @@ -440,13 +440,13 @@ func (h *ElementHandle) ownerFrame(apiCtx context.Context) *Frame { if frameId == "" { return nil } - frame, found := h.frame.page.frameManager.getFrameByID(frameId) - if found { + frame, ok := h.frame.page.frameManager.getFrameByID(frameId) + if ok { return frame } for _, page := range h.frame.page.browserCtx.browser.pages { - frame, found = page.frameManager.getFrameByID(frameId) - if found { + frame, ok = page.frameManager.getFrameByID(frameId) + if ok { return frame } } @@ -766,8 +766,8 @@ func (h *ElementHandle) ContentFrame() (*Frame, error) { return nil, fmt.Errorf("element is not an iframe") } - frame, found := h.frame.manager.getFrameByID(node.FrameID) - if !found { + frame, ok := h.frame.manager.getFrameByID(node.FrameID) + if !ok { return nil, fmt.Errorf("frame not found for id %s", node.FrameID) } @@ -1008,8 +1008,8 @@ func (h *ElementHandle) OwnerFrame() (*Frame, error) { return nil, fmt.Errorf("no frame found for node: %w", err) } - frame, found := h.frame.manager.getFrameByID(node.FrameID) - if !found { + frame, ok := h.frame.manager.getFrameByID(node.FrameID) + if !ok { return nil, fmt.Errorf("no frame found for id %s", node.FrameID) } diff --git a/common/frame.go b/common/frame.go index c96e69523..2ab8eb1a8 100644 --- a/common/frame.go +++ b/common/frame.go @@ -377,8 +377,8 @@ func (f *Frame) onLoadingStopped() { } func (f *Frame) position() (*Position, error) { - frame, found := f.manager.getFrameByID(cdp.FrameID(f.page.targetID)) - if !found { + frame, ok := f.manager.getFrameByID(cdp.FrameID(f.page.targetID)) + if !ok { return nil, fmt.Errorf("could not find frame with id %s", f.page.targetID) } if frame == f.page.frameManager.MainFrame() { diff --git a/common/frame_manager.go b/common/frame_manager.go index 17321b01c..cbdb69750 100644 --- a/common/frame_manager.go +++ b/common/frame_manager.go @@ -165,8 +165,8 @@ func (m *FrameManager) frameAttached(frameID cdp.FrameID, parentFrameID cdp.Fram func (m *FrameManager) frameDetached(frameID cdp.FrameID, reason cdppage.FrameDetachedReason) { m.logger.Debugf("FrameManager:frameDetached", "fmid:%d fid:%v", m.ID(), frameID) - frame, found := m.getFrameByID(frameID) - if !found { + frame, ok := m.getFrameByID(frameID) + if !ok { m.logger.Debugf("FrameManager:frameDetached:return", "fmid:%d fid:%v cannot find frame", m.ID(), frameID) @@ -190,8 +190,8 @@ func (m *FrameManager) frameLifecycleEvent(frameID cdp.FrameID, event LifecycleE "fmid:%d fid:%v event:%s", m.ID(), frameID, lifecycleEventToString[event]) - frame, found := m.getFrameByID(frameID) - if found { + frame, ok := m.getFrameByID(frameID) + if ok { frame.onLifecycleEvent(event) } } @@ -200,8 +200,8 @@ func (m *FrameManager) frameLoadingStarted(frameID cdp.FrameID) { m.logger.Debugf("FrameManager:frameLoadingStarted", "fmid:%d fid:%v", m.ID(), frameID) - frame, found := m.getFrameByID(frameID) - if found { + frame, ok := m.getFrameByID(frameID) + if ok { frame.onLoadingStarted() } } @@ -210,8 +210,8 @@ func (m *FrameManager) frameLoadingStopped(frameID cdp.FrameID) { m.logger.Debugf("FrameManager:frameLoadingStopped", "fmid:%d fid:%v", m.ID(), frameID) - frame, found := m.getFrameByID(frameID) - if found { + frame, ok := m.getFrameByID(frameID) + if ok { frame.onLoadingStopped() } } diff --git a/common/frame_session.go b/common/frame_session.go index 4a7105896..cdbd822ba 100644 --- a/common/frame_session.go +++ b/common/frame_session.go @@ -434,8 +434,8 @@ func (fs *FrameSession) initIsolatedWorld(name string) error { if fs.isMainFrame() { frames = fs.manager.Frames() } else { - frame, found := fs.manager.getFrameByID(cdp.FrameID(fs.targetID)) - if found { + frame, ok := fs.manager.getFrameByID(cdp.FrameID(fs.targetID)) + if ok { frames = []*Frame{frame} } } @@ -662,8 +662,8 @@ func (fs *FrameSession) onExecutionContextCreated(event *cdpruntime.EventExecuti k6ext.Panic(fs.ctx, "unmarshaling executionContextCreated event JSON: %w", err) } var world executionWorld - frame, found := fs.manager.getFrameByID(i.FrameID) - if found { + frame, ok := fs.manager.getFrameByID(i.FrameID) + if ok { if i.IsDefault { world = mainWorld } else if event.Context.Name == utilityWorldName && !frame.hasContext(utilityWorld) { @@ -763,12 +763,12 @@ func (fs *FrameSession) onFrameNavigated(frame *cdp.Frame, initial bool) { ) var ( - spanID = fs.mainFrameSpan.SpanContext().SpanID().String() - newFrame, found = fs.manager.getFrameByID(frame.ID) + spanID = fs.mainFrameSpan.SpanContext().SpanID().String() + newFrame, ok = fs.manager.getFrameByID(frame.ID) ) // Only set the k6SpanId reference if it's a new frame. - if !found { + if !ok { return } @@ -854,8 +854,8 @@ func (fs *FrameSession) onPageLifecycle(event *cdppage.EventLifecycleEvent) { "sid:%v tid:%v fid:%v event:%s eventTime:%q", fs.session.ID(), fs.targetID, event.FrameID, event.Name, event.Timestamp.Time()) - _, found := fs.manager.getFrameByID(event.FrameID) - if !found { + _, ok := fs.manager.getFrameByID(event.FrameID) + if !ok { return } @@ -956,8 +956,8 @@ func (fs *FrameSession) onAttachedToTarget(event *target.EventAttachedToTarget) // attachIFrameToTarget attaches an IFrame target to a given session. func (fs *FrameSession) attachIFrameToTarget(ti *target.Info, sid target.SessionID) error { - fr, found := fs.manager.getFrameByID(cdp.FrameID(ti.TargetID)) - if !found { + fr, ok := fs.manager.getFrameByID(cdp.FrameID(ti.TargetID)) + if !ok { // IFrame should be attached to fs.page with EventFrameAttached // event before. fs.logger.Debugf("FrameSession:attachIFrameToTarget:return", diff --git a/common/network_manager.go b/common/network_manager.go index bf2449ad5..177ba4af8 100644 --- a/common/network_manager.go +++ b/common/network_manager.go @@ -458,11 +458,11 @@ func (m *NetworkManager) onRequest(event *network.EventRequestWillBeSent, interc } var frame *Frame = nil - var found bool + var ok bool if event.FrameID != "" { - frame, found = m.frameManager.getFrameByID(event.FrameID) + frame, ok = m.frameManager.getFrameByID(event.FrameID) } - if !found { + if !ok { m.logger.Debugf("NetworkManager:onRequest", "url:%s method:%s type:%s fid:%s frame is nil", event.Request.URL, event.Request.Method, event.Initiator.Type, event.FrameID) }