Fix tests

src/github.com/stellar/gateway/bridge/handlers/request_handler_builder_test.go

@@ -1,15 +1,11 @@
 package handlers
 
 import (
-	// "encoding/hex"
-	// "errors"
 	"net/http"
 	"net/http/httptest"
-	// "net/url"
 	"strings"
 	"testing"
 
-	"github.com/facebookgo/inject"
 	. "github.com/smartystreets/goconvey/convey"
 	"github.com/stellar/gateway/bridge/config"
 	"github.com/stellar/gateway/horizon"
@@ -21,31 +17,20 @@ import (
 
 func TestRequestHandlerBuilder(t *testing.T) {
 	c := &config.Config{NetworkPassphrase: "Test SDF Network ; September 2015"}
+
 	mockHorizon := new(mocks.MockHorizon)
 	mockHTTPClient := new(mocks.MockHTTPClient)
 	mockTransactionSubmitter := new(mocks.MockTransactionSubmitter)
 	mockFederationResolver := new(mocks.MockFederationResolver)
 	mockStellartomlResolver := new(mocks.MockStellartomlResolver)
-	requestHandler := RequestHandler{}
-
-	// Inject mocks
-	var g inject.Graph
-
-	err := g.Provide(
-		&inject.Object{Value: &requestHandler},
-		&inject.Object{Value: c},
-		&inject.Object{Value: mockHorizon},
-		&inject.Object{Value: mockHTTPClient},
-		&inject.Object{Value: mockTransactionSubmitter},
-		&inject.Object{Value: mockFederationResolver},
-		&inject.Object{Value: mockStellartomlResolver},
-	)
-	if err != nil {
-		panic(err)
-	}
 
-	if err := g.Populate(); err != nil {
-		panic(err)
+	requestHandler := RequestHandler{
+		Config:               c,
+		Client:               mockHTTPClient,
+		Horizon:              mockHorizon,
+		TransactionSubmitter: mockTransactionSubmitter,
+		FederationResolver:   mockFederationResolver,
+		StellarTomlResolver:  mockStellartomlResolver,
 	}
 
 	testServer := httptest.NewServer(http.HandlerFunc(requestHandler.Builder))

src/github.com/stellar/gateway/bridge/handlers/request_handler_payment_test.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/facebookgo/inject"
 	. "github.com/smartystreets/goconvey/convey"
 	"github.com/stellar/gateway/bridge/config"
 	"github.com/stellar/gateway/horizon"
@@ -37,26 +36,14 @@ func TestRequestHandlerPayment(t *testing.T) {
 	mockTransactionSubmitter := new(mocks.MockTransactionSubmitter)
 	mockFederationResolver := new(mocks.MockFederationResolver)
 	mockStellartomlResolver := new(mocks.MockStellartomlResolver)
-	requestHandler := RequestHandler{}
-
-	// Inject mocks
-	var g inject.Graph
-
-	err := g.Provide(
-		&inject.Object{Value: &requestHandler},
-		&inject.Object{Value: c},
-		&inject.Object{Value: mockHorizon},
-		&inject.Object{Value: mockHTTPClient},
-		&inject.Object{Value: mockTransactionSubmitter},
-		&inject.Object{Value: mockFederationResolver},
-		&inject.Object{Value: mockStellartomlResolver},
-	)
-	if err != nil {
-		panic(err)
-	}
 
-	if err := g.Populate(); err != nil {
-		panic(err)
+	requestHandler := RequestHandler{
+		Config:               c,
+		Client:               mockHTTPClient,
+		Horizon:              mockHorizon,
+		TransactionSubmitter: mockTransactionSubmitter,
+		FederationResolver:   mockFederationResolver,
+		StellarTomlResolver:  mockStellartomlResolver,
 	}
 
 	testServer := httptest.NewServer(http.HandlerFunc(requestHandler.Payment))

src/github.com/stellar/gateway/mocks/main.go

@@ -158,6 +158,22 @@ func (m *MockRepository) GetReceivedPaymentByOperationID(operationID int64) (*en
 	return a.Get(0).(*entities.ReceivedPayment), a.Error(1)
 }
 
+func (m *MockRepository) GetReceivedPayments(page, limit int) ([]*entities.ReceivedPayment, error) {
+	a := m.Called(page, limit)
+	if a.Get(0) == nil {
+		return nil, a.Error(1)
+	}
+	return a.Get(0).([]*entities.ReceivedPayment), a.Error(1)
+}
+
+func (m *MockRepository) GetSentTransactions(page, limit int) ([]*entities.SentTransaction, error) {
+	a := m.Called(page, limit)
+	if a.Get(0) == nil {
+		return nil, a.Error(1)
+	}
+	return a.Get(0).([]*entities.SentTransaction), a.Error(1)
+}
+
 // MockSignerVerifier ...
 type MockSignerVerifier struct {
 	mock.Mock