Remove addition of protocols/horizon dependency

Author: leighmcculloch

txnbuild/set_options.go

@@ -1,7 +1,6 @@
 package txnbuild
 
 import (
-	hProtocol "github.com/stellar/go/protocols/horizon"
 	"github.com/stellar/go/support/errors"
 	"github.com/stellar/go/xdr"
 )
@@ -33,25 +32,6 @@ type Signer struct {
 	Weight  Threshold
 }
 
-// SignerFromHorizon converts a signer retrieved from Horizon to a txnbuild
-// Signer.
-func SignerFromHorizon(horizonSigner hProtocol.Signer) Signer {
-	return Signer{
-		Address: horizonSigner.Key,
-		Weight:  Threshold(horizonSigner.Weight),
-	}
-}
-
-// SignersFromHorizon converts a list of signers retrieved from Horizon to
-// txnbuild Signers.
-func SignersFromHorizon(horizonSigners []hProtocol.Signer) []Signer {
-	signers := make([]Signer, 0, len(horizonSigners))
-	for _, hs := range horizonSigners {
-		signers = append(signers, SignerFromHorizon(hs))
-	}
-	return signers
-}
-
 // NewHomeDomain is syntactic sugar that makes instantiating SetOptions more convenient.
 func NewHomeDomain(hd string) *string {
 	return &hd

txnbuild/set_options_test.go

@@ -3,7 +3,6 @@ package txnbuild
 import (
 	"testing"
 
-	hProtocol "github.com/stellar/go/protocols/horizon"
 	"github.com/stellar/go/xdr"
 	"github.com/stretchr/testify/assert"
 )
@@ -137,27 +136,3 @@ func TestEmptyHomeDomainOK(t *testing.T) {
 	assert.Equal(t, string(*options.xdrOp.HomeDomain), "", "empty string home domain is set")
 
 }
-
-func TestSignerFromHorizon(t *testing.T) {
-	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 := []hProtocol.Signer{
-		{Key: "GAABGBW5DINUS456OTHH6IUPTQSQZVVFCZGAO467OLIPFUWTMV6XR5XS", Weight: 0},
-		{Key: "GAT4FUGQNKOIDLOIXCJJYFSAFJHQY5MZEZLRBXXFKDCXGUHJQ63XZFTD", Weight: 10},
-		{Key: "GCB35H32SU5ME4OALQUPOM4AADJICL2H2NLWAGLOMMTSYOVTXWYP6Q4T", Weight: 100},
-		{Key: "GAVJHRCK5CEFE3MHL4JALMNX35Z5NLUIODSJIC44VRRLQQZGTDJWANV4", Weight: 255},
-	}
-	wantSigners := []Signer{
-		{Address: "GAABGBW5DINUS456OTHH6IUPTQSQZVVFCZGAO467OLIPFUWTMV6XR5XS", Weight: 0},
-		{Address: "GAT4FUGQNKOIDLOIXCJJYFSAFJHQY5MZEZLRBXXFKDCXGUHJQ63XZFTD", Weight: 10},
-		{Address: "GCB35H32SU5ME4OALQUPOM4AADJICL2H2NLWAGLOMMTSYOVTXWYP6Q4T", Weight: 100},
-		{Address: "GAVJHRCK5CEFE3MHL4JALMNX35Z5NLUIODSJIC44VRRLQQZGTDJWANV4", Weight: 255},
-	}
-	signers := SignersFromHorizon(horizonSigners)
-	assert.Equal(t, wantSigners, signers)
-}

txnbuild/transaction_challenge_example_test.go

@@ -92,7 +92,13 @@ func ExampleVerifyChallengeTxThreshold() {
 
 		if clientAccountExists {
 			// Server gets list of signers from account
-			signers := txnbuild.SignersFromHorizon(horizonClientAccount.Signers)
+			signers := make([]txnbuild.Signer, 0, len(horizonClientAccount.Signers))
+			for _, hs := range horizonClientAccount.Signers {
+				signers = append(signers, txnbuild.Signer{
+					Address: hs.Key,
+					Weight:  txnbuild.Threshold(hs.Weight),
+				})
+			}
 
 			// Server chooses the threshold to require: low, med or high
 			threshold := txnbuild.Threshold(horizonClientAccount.Thresholds.MedThreshold)