Remove unneeded message widgets (#40)

* Remove unneeded message widgets

* Remove unused stuff

gui/drawer.go

@@ -17,8 +17,6 @@ type drawer struct {
 	chartCh   chan *attacker.Result
 	gaugeCh   chan bool
 	metricsCh chan *attacker.Metrics
-	// TODO: Remove
-	messageCh chan string
 
 	// aims to avoid to perform multiple `redrawChart`.
 	chartDrawing bool
@@ -160,15 +158,3 @@ func (d *drawer) redrawMetrics(ctx context.Context) {
 		}
 	}
 }
-
-func (d *drawer) redrawMessage(ctx context.Context) {
-	defer close(d.messageCh)
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case m := <-d.messageCh:
-			d.widgets.messageText.Write(m, text.WriteReplace())
-		}
-	}
-}

gui/drawer_test.go

@@ -265,38 +265,3 @@ End: 2009-11-10 23:00:00 +0000 UTC`, gomock.Any())
 		})
 	}
 }
-
-func TestRedrawMessage(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	tests := []struct {
-		name    string
-		message string
-		text    Text
-	}{
-		{
-			name:    "write foo",
-			message: "foo",
-			text: func() Text {
-				g := NewMockText(ctrl)
-				g.EXPECT().Write("foo", gomock.Any())
-				return g
-			}(),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-			d := &drawer{
-				widgets:   &widgets{messageText: tt.text},
-				messageCh: make(chan string),
-			}
-			go d.redrawMessage(ctx)
-			d.messageCh <- tt.message
-			cancel()
-			<-d.messageCh
-		})
-	}
-}

gui/gui.go

@@ -58,10 +58,8 @@ func run(t *termbox.Terminal, r runner, targetURL string, opts *attacker.Options
 		chartCh:   make(chan *attacker.Result),
 		gaugeCh:   make(chan bool),
 		metricsCh: make(chan *attacker.Metrics),
-		messageCh: make(chan string),
 	}
 	go d.redrawMetrics(ctx)
-	go d.redrawMessage(ctx)
 
 	k := keybinds(ctx, cancel, d, targetURL, *opts)
 

gui/keybinds.go

@@ -23,7 +23,6 @@ func keybinds(ctx context.Context, cancel context.CancelFunc, dr *drawer, target
 
 func attack(ctx context.Context, d *drawer, target string, opts attacker.Options) {
 	if d.chartDrawing {
-		d.messageCh <- "Wait until the attack is over"
 		return
 	}
 	requestNum := opts.Rate * int(opts.Duration/time.Second)
@@ -34,6 +33,5 @@ func attack(ctx context.Context, d *drawer, target string, opts attacker.Options
 	go func(ctx context.Context, d *drawer, t string, o attacker.Options) {
 		attacker.Attack(ctx, t, d.chartCh, d.metricsCh, o) // this blocks until attack finishes
 		d.chartCh <- &attacker.Result{End: true}
-		d.messageCh <- "Attack completed"
 	}(ctx, d, target, opts)
 }

gui/keybinds_test.go

@@ -61,14 +61,12 @@ func TestAttack(t *testing.T) {
 			d := &drawer{
 				widgets: &widgets{
 					latencyChart:  nil,
-					messageText:   nil,
 					latenciesText: nil,
 					bytesText:     nil,
 					othersText:    nil,
 					progressGauge: nil,
 					navi:          nil,
 				},
-				messageCh:    make(chan string, 100),
 				chartDrawing: tt.chartDrawing,
 			}
 			attack(ctx, d, "", attacker.Options{})

gui/widgets.go

@@ -32,7 +32,6 @@ type widgets struct {
 	latencyChart LineChart
 
 	paramsText      Text
-	messageText     Text
 	latenciesText   Text
 	bytesText       Text
 	statusCodesText Text
@@ -49,10 +48,6 @@ func newWidgets(targetURL string, opts *attacker.Options) (*widgets, error) {
 		return nil, err
 	}
 
-	messageText, err := newText("Give the target URL and press Enter")
-	if err != nil {
-		return nil, err
-	}
 	latenciesText, err := newText("")
 	if err != nil {
 		return nil, err
@@ -90,7 +85,6 @@ func newWidgets(targetURL string, opts *attacker.Options) (*widgets, error) {
 	return &widgets{
 		latencyChart:    latencyChart,
 		paramsText:      paramsText,
-		messageText:     messageText,
 		latenciesText:   latenciesText,
 		bytesText:       bytesText,
 		statusCodesText: statusCodesText,
@@ -124,9 +118,7 @@ func newText(s string) (Text, error) {
 
 func newGauge() (Gauge, error) {
 	return gauge.New(
-		//gauge.Height(1),
 		gauge.Border(linestyle.None),
-		//gauge.BorderTitle("Progress"),
 	)
 }
 

main.go

@@ -43,7 +43,6 @@ Author:
 )
 
 type cli struct {
-	target   string
 	rate     int
 	duration time.Duration
 	timeout  time.Duration