Removed clock dependency

Author: sryanh

channel_writer.go

@@ -2,8 +2,8 @@ package rabbitmq
 
 import (
 	"sync"
+	"time"
 
-	"github.com/smartystreets/clock"
 	"github.com/smartystreets/messaging/v2"
 )
 
@@ -23,7 +23,7 @@ func (this *ChannelWriter) Write(message messaging.Dispatch) error {
 		return messaging.ErrWriterClosed
 	}
 
-	dispatch := toAMQPDispatch(message, clock.UTCNow())
+	dispatch := toAMQPDispatch(message, utcNow())
 	err := this.channel.PublishMessage(message.Destination, message.Partition, dispatch)
 	if err == nil {
 		return nil
@@ -33,7 +33,9 @@ func (this *ChannelWriter) Write(message messaging.Dispatch) error {
 	this.channel = nil
 	return err
 }
-
+func utcNow() time.Time {
+	return time.Now().UTC()
+}
 func (this *ChannelWriter) Commit() error {
 	return nil
 }

go.mod

@@ -4,7 +4,6 @@ go 1.13
 
 require (
 	github.com/smartystreets/assertions v1.1.0
-	github.com/smartystreets/clock v1.0.3
 	github.com/smartystreets/gunit v1.3.4
 	github.com/smartystreets/logging v1.1.1
 	github.com/smartystreets/messaging/v2 v2.1.1

go.sum

@@ -1,7 +1,5 @@
 github.com/smartystreets/assertions v1.1.0 h1:MkTeG1DMwsrdH7QtLXy5W+fUxWq+vmb6cLmyJ7aRtF0=
 github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
-github.com/smartystreets/clock v1.0.3 h1:rZ2gtRux+yALko49BywVFcrWcfRg8V86Q+wwYP+SCWs=
-github.com/smartystreets/clock v1.0.3/go.mod h1:SeXxrsL1+0aE4256nYPPBWwuA9BGfiXu5+bxfXFsPGA=
 github.com/smartystreets/gunit v1.3.4 h1:iHc8Rfhb/uCOc9a3KGuD3ut22L+hLIVaqR1o5fS6zC4=
 github.com/smartystreets/gunit v1.3.4/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
 github.com/smartystreets/logging v1.1.1 h1:4UlnyYWB7LDd216NTuP3zTVvMQZREtPrDnJbsz0zftI=

mq_adapter_test.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/smartystreets/assertions/should"
-	"github.com/smartystreets/clock"
 	"github.com/smartystreets/gunit"
 	"github.com/smartystreets/messaging/v2"
 	"github.com/streadway/amqp"
@@ -21,7 +20,7 @@ type RabbitAdapterFixture struct {
 }
 
 func (this *RabbitAdapterFixture) Setup() {
-	this.now = clock.UTCNow()
+	this.now = utcNow()
 }
 
 /////////////////////////////////////////////////////////////////////////////////

subscription.go

@@ -2,8 +2,8 @@ package rabbitmq
 
 import (
 	"strconv"
+	"time"
 
-	"github.com/smartystreets/clock"
 	"github.com/smartystreets/logging"
 	"github.com/smartystreets/messaging/v2"
 	"github.com/streadway/amqp"
@@ -29,7 +29,7 @@ func newSubscription(
 	return &Subscription{
 		channel:  channel,
 		queue:    queue,
-		consumer: strconv.FormatInt(clock.UTCNow().UnixNano(), 10),
+		consumer: strconv.FormatInt(time.Now().UTC().UnixNano(), 10),
 		bindings: bindings,
 		control:  control,
 		output:   output,

subscription_test.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/smartystreets/assertions/should"
-	"github.com/smartystreets/clock"
 	"github.com/smartystreets/gunit"
 	"github.com/smartystreets/logging"
 	"github.com/smartystreets/messaging/v2"
@@ -167,7 +166,7 @@ func (this *FakeSubscriptionChannel) DeclareQueue(name string) error {
 	return nil
 }
 func (this *FakeSubscriptionChannel) DeclareTransientQueue() (string, error) {
-	return strconv.FormatInt(clock.UTCNow().UnixNano(), 10), nil
+	return strconv.FormatInt(time.Now().UTC().UnixNano(), 10), nil
 }
 func (this *FakeSubscriptionChannel) BindExchangeToQueue(queue string, exchange string) error {
 	this.boundQueue = append(this.boundQueue, queue)

transaction_writer.go

@@ -3,7 +3,6 @@ package rabbitmq
 import (
 	"sync"
 
-	"github.com/smartystreets/clock"
 	"github.com/smartystreets/logging"
 	"github.com/smartystreets/messaging/v2"
 )
@@ -32,7 +31,7 @@ func (this *TransactionWriter) Write(message messaging.Dispatch) error {
 	// FUTURE: if error on publish, don't publish anything else
 	// until we reset the channel during commit
 	// opening a new channel is what marks it as able to continue
-	dispatch := toAMQPDispatch(message, clock.UTCNow())
+	dispatch := toAMQPDispatch(message, utcNow())
 	return this.channel.PublishMessage(message.Destination, message.Partition, dispatch)
 }