Remove dependency on clients/horizon

Author: leighmcculloch

txnbuild/set_options.go

@@ -1,7 +1,7 @@
 package txnbuild
 
 import (
-	"github.com/stellar/go/clients/horizon"
+	hProtocol "github.com/stellar/go/protocols/horizon"
 	"github.com/stellar/go/support/errors"
 	"github.com/stellar/go/xdr"
 )
@@ -35,7 +35,7 @@ type Signer struct {
 
 // SignerFromHorizon converts a signer retrieved from Horizon to a txnbuild
 // Signer.
-func SignerFromHorizon(horizonSigner horizon.Signer) Signer {
+func SignerFromHorizon(horizonSigner hProtocol.Signer) Signer {
 	return Signer{
 		Address: horizonSigner.Key,
 		Weight:  Threshold(horizonSigner.Weight),
@@ -44,7 +44,7 @@ func SignerFromHorizon(horizonSigner horizon.Signer) Signer {
 
 // SignersFromHorizon converts a list of signers retrieved from Horizon to
 // txnbuild Signers.
-func SignersFromHorizon(horizonSigners []horizon.Signer) []Signer {
+func SignersFromHorizon(horizonSigners []hProtocol.Signer) []Signer {
 	signers := make([]Signer, 0, len(horizonSigners))
 	for _, hs := range horizonSigners {
 		signers = append(signers, SignerFromHorizon(hs))

txnbuild/set_options_test.go

@@ -3,7 +3,7 @@ package txnbuild
 import (
 	"testing"
 
-	"github.com/stellar/go/clients/horizon"
+	hProtocol "github.com/stellar/go/protocols/horizon"
 	"github.com/stellar/go/xdr"
 	"github.com/stretchr/testify/assert"
 )
@@ -139,14 +139,14 @@ func TestEmptyHomeDomainOK(t *testing.T) {
 }
 
 func TestSignerFromHorizon(t *testing.T) {
-	horizonSigner := horizon.Signer{Key: "GAABGBW5DINUS456OTHH6IUPTQSQZVVFCZGAO467OLIPFUWTMV6XR5XS", Weight: 10}
+	horizonSigner := hProtocol.Signer{Key: "GAABGBW5DINUS456OTHH6IUPTQSQZVVFCZGAO467OLIPFUWTMV6XR5XS", Weight: 10}
 	wantSigner := Signer{Address: "GAABGBW5DINUS456OTHH6IUPTQSQZVVFCZGAO467OLIPFUWTMV6XR5XS", Weight: 10}
 	signer := SignerFromHorizon(horizonSigner)
 	assert.Equal(t, wantSigner, signer)
 }
 
 func TestSignersFromHorizon(t *testing.T) {
-	horizonSigners := []horizon.Signer{
+	horizonSigners := []hProtocol.Signer{
 		{Key: "GAABGBW5DINUS456OTHH6IUPTQSQZVVFCZGAO467OLIPFUWTMV6XR5XS", Weight: 0},
 		{Key: "GAT4FUGQNKOIDLOIXCJJYFSAFJHQY5MZEZLRBXXFKDCXGUHJQ63XZFTD", Weight: 10},
 		{Key: "GCB35H32SU5ME4OALQUPOM4AADJICL2H2NLWAGLOMMTSYOVTXWYP6Q4T", Weight: 100},