From 69ecda18f9d8c42edceaa77061ad1081a323ccbd Mon Sep 17 00:00:00 2001
From: Dev Ojha <ValarDragon@users.noreply.github.com>
Date: Thu, 11 Oct 2018 07:16:25 -0700
Subject: [PATCH] refactor nop_event_bus.go into event_bus.go (#2605)

This is just to match the style of the rest of the codebase, and to
reduce the number of files in types.
---
 types/event_bus.go     | 71 ++++++++++++++++++++++++++++++++++++++
 types/nop_event_bus.go | 77 ------------------------------------------
 2 files changed, 71 insertions(+), 77 deletions(-)
 delete mode 100644 types/nop_event_bus.go

diff --git a/types/event_bus.go b/types/event_bus.go
index 466ae7b44..269d5ab1f 100644
--- a/types/event_bus.go
+++ b/types/event_bus.go
@@ -165,3 +165,74 @@ func logIfTagExists(tag string, tags map[string]string, logger log.Logger) {
 		logger.Error("Found predefined tag (value will be overwritten)", "tag", tag, "value", value)
 	}
 }
+
+//-----------------------------------------------------------------------------
+type NopEventBus struct{}
+
+func (NopEventBus) Subscribe(ctx context.Context, subscriber string, query tmpubsub.Query, out chan<- interface{}) error {
+	return nil
+}
+
+func (NopEventBus) Unsubscribe(ctx context.Context, subscriber string, query tmpubsub.Query) error {
+	return nil
+}
+
+func (NopEventBus) UnsubscribeAll(ctx context.Context, subscriber string) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventNewBlock(data EventDataNewBlock) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventNewBlockHeader(data EventDataNewBlockHeader) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventVote(data EventDataVote) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventTx(data EventDataTx) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventNewRoundStep(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventTimeoutPropose(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventTimeoutWait(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventNewRound(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventCompleteProposal(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventPolka(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventUnlock(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventRelock(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventLock(data EventDataRoundState) error {
+	return nil
+}
+
+func (NopEventBus) PublishEventValidatorSetUpdates(data EventDataValidatorSetUpdates) error {
+	return nil
+}
diff --git a/types/nop_event_bus.go b/types/nop_event_bus.go
deleted file mode 100644
index 93694da47..000000000
--- a/types/nop_event_bus.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package types
-
-import (
-	"context"
-
-	tmpubsub "github.com/tendermint/tendermint/libs/pubsub"
-)
-
-type NopEventBus struct{}
-
-func (NopEventBus) Subscribe(ctx context.Context, subscriber string, query tmpubsub.Query, out chan<- interface{}) error {
-	return nil
-}
-
-func (NopEventBus) Unsubscribe(ctx context.Context, subscriber string, query tmpubsub.Query) error {
-	return nil
-}
-
-func (NopEventBus) UnsubscribeAll(ctx context.Context, subscriber string) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventNewBlock(data EventDataNewBlock) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventNewBlockHeader(data EventDataNewBlockHeader) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventVote(data EventDataVote) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventTx(data EventDataTx) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventNewRoundStep(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventTimeoutPropose(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventTimeoutWait(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventNewRound(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventCompleteProposal(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventPolka(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventUnlock(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventRelock(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventLock(data EventDataRoundState) error {
-	return nil
-}
-
-func (NopEventBus) PublishEventValidatorSetUpdates(data EventDataValidatorSetUpdates) error {
-	return nil
-}