From a6ffa95e067d6d936c2f7c4e66859210dac5bc62 Mon Sep 17 00:00:00 2001 From: Nikhil Saraf <1028334+nikhilsaraf@users.noreply.github.com> Date: Wed, 8 May 2019 14:57:41 -0700 Subject: [PATCH] upgrade stellar/go dependency version to use horizonclient-v1.1.0 for new horizonclient SDK --- cmd/trade.go | 2 +- glide.lock | 79 +++++++++++++++++++++++++-------------- glide.yaml | 4 +- plugins/sdexExtensions.go | 2 +- 4 files changed, 55 insertions(+), 32 deletions(-) diff --git a/cmd/trade.go b/cmd/trade.go index 73aac2356..44b5960c6 100644 --- a/cmd/trade.go +++ b/cmd/trade.go @@ -14,7 +14,7 @@ import ( "github.com/spf13/cobra" "github.com/stellar/go/build" "github.com/stellar/go/clients/horizon" - horizonclient "github.com/stellar/go/exp/clients/horizon" + "github.com/stellar/go/clients/horizonclient" "github.com/stellar/go/support/config" "github.com/stellar/kelp/api" "github.com/stellar/kelp/model" diff --git a/glide.lock b/glide.lock index 64c289abd..f09280c85 100644 --- a/glide.lock +++ b/glide.lock @@ -1,50 +1,61 @@ -hash: 9241e59b7d407fb7068a854d8095fe3e47c061c24444ad02967f4fae601679f3 -updated: 2019-05-05T16:24:15.137639328-07:00 +hash: dcf7e7c6884927442b6d33832e78bf8389a6abae608287c5ee21bcec91166f35 +updated: 2019-05-08T14:55:34.286101693-07:00 imports: - name: cloud.google.com/go - version: 793297ec250352b0ece46e103381a0fc3dab95a1 + version: 24f9f82cf8c5ed3c0303f34f76876365ce742aad subpackages: - compute/metadata - name: github.com/asaskevich/govalidator - version: f9ffefc3facfbe0caee3fea233cbb6e8208f4541 + version: f61b66f89f4a311bef65f13e575bcf1a2ffadda6 - name: github.com/Beldur/kraken-go-api-client version: 8d8ccfe4cc60d1703ffe596c889b887a318a884c - name: github.com/BurntSushi/toml - version: 99064174e013895bbd9b025c31100bd1d9b590ca + version: 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 - name: github.com/davecgh/go-spew - version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 + version: d8f796af33cc11cb798c1aaeb27a4ebc5099927d subpackages: - spew +- name: github.com/fsnotify/fsnotify + version: 1485a34d5d5723fea214f5710708e19a831720e4 - name: github.com/go-chi/chi version: da24bba8dcd4021cafac38724bf10dccc97c3e36 subpackages: - middleware - name: github.com/go-errors/errors - version: a41850380601eeb43f4350f7d17c6bbd8944aaf8 + version: d98b870cc4e05f1545532a80e9909be8216095b6 - name: github.com/golang/protobuf - version: d3de96c4c28ef8af3aa1a892fc481e0f103c01ff + version: e91709a02e0e8ff8b86b7aa913fdc9ae9498e825 subpackages: - proto - name: github.com/google/go-querystring - version: 44c6ddd0a2342c386950e880b658017258da92fc + version: c8c88dbee036db4e4808d1f2ec8c2e15e11c3f80 subpackages: - query +- name: github.com/hashicorp/hcl + version: 99e2f22d1c94b272184d97dd9d252866409100ab + subpackages: + - hcl/ast + - hcl/parser + - hcl/printer + - hcl/scanner + - hcl/strconv + - hcl/token + - json/parser + - json/scanner + - json/token - name: github.com/inconshreveable/mousetrap version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 -- name: github.com/kr/pretty - version: e6ac2fc51e89a3249e82157fa0bb7a18ef9dd5bb - name: github.com/kr/session version: 6f756089c21ec9a4ceb14473bf90d5e3a3e9e303 -- name: github.com/kr/text - version: e373e137fafd8abd480af49182dea0513914adb4 - name: github.com/lechengfan/googleauth version: 7595ba02fbce171759c10d69d96e4cd898d1fa93 - name: github.com/lib/pq - version: 50761b0867bd1d9d069276790bcd4a3bccf2324a + version: 2ff3cb3adc01768e0a552b3a02575a6df38a9bea subpackages: - oid + - scram - name: github.com/magiconair/properties - version: 359442d561ca28acd0fe503aa9f075f505bc9ed0 + version: 7757cc9fdb852f7579b24170bcacda2c7471bb6a - name: github.com/manucorporat/sse version: ee05b128a739a0fb76c7ebd3ae4810c1de808d6d - name: github.com/mitchellh/mapstructure @@ -55,16 +66,18 @@ imports: - multithreading - name: github.com/PagerDuty/go-pagerduty version: 635c5ce271490fba94880e62cde4eea3c1c184b9 +- name: github.com/pelletier/go-toml + version: 728039f679cbcd4f6a54e080d2219a4c4928c546 - name: github.com/pkg/errors version: 645ef00459ed84a119197bfb8d8205042c6df63d - name: github.com/pmezard/go-difflib - version: d8ed2627bdf02c080bf22230dbb337003b7aba2d + version: 5d4384ee4fb2527b0a1256a821ebfc92f91efefc subpackages: - difflib - name: github.com/rs/cors version: 9a47f48565a795472d43519dd49aac781f3034fb - name: github.com/segmentio/go-loggly - version: eb91657e62b25699dd4e84d5562735440d4beace + version: 7a70408c3650c37ba8e58a934f686d0c44cb9b58 - name: github.com/shurcooL/httpfs version: 74dc9339e414ad069a8d04bba7e7aafd08043a25 subpackages: @@ -75,24 +88,28 @@ imports: version: 070c81def33f6362a8267b6a4e56fb7bf23fc6b5 subpackages: - hooks/test +- name: github.com/spf13/afero + version: 588a75ec4f32903aa5e39a2619ba6a4631e28424 + subpackages: + - mem - name: github.com/spf13/cast - version: 4d07383ffe94b5e5a6fa3af9211374a4507a0184 + version: 8c9545af88b134710ab1cd196795e7f2388358d7 - name: github.com/spf13/cobra version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b - name: github.com/spf13/jwalterweatherman - version: 3d60171a64319ef63c78bd45bd60e6eab1e75f8b + version: 94f6ae3ed3bceceafa716478c5fbf8d29ca601a1 - name: github.com/spf13/pflag version: e57e3eeb33f795204c1ca35f56c44f83227c6e66 - name: github.com/spf13/viper - version: db7ff930a189b98d602179d9001d33345f42b8c7 + version: 7a605a50e69cd1ea431c4a1e6eebe9b287ef6de4 - name: github.com/stellar/go - version: a45d1ae036357adf337060c7b15dbe9abc235025 + version: 0f63acf3a20e4b76aa0c2d6b1ecaaa0657208cb7 subpackages: - amount - build - clients/horizon + - clients/horizonclient - crc16 - - exp/clients/horizon - hash - keypair - network @@ -111,15 +128,16 @@ imports: - support/render/problem - support/strutils - support/url + - txnbuild - xdr - name: github.com/stellar/go-xdr version: 0bc96f33a18ef2f963e75431dbed042129eb421b subpackages: - xdr3 - name: github.com/stretchr/objx - version: cbeaeb16a013161a98496fad62933b1d21786672 + version: 35313a95ee26395aa17d366c71a2ccf788fa69b6 - name: github.com/stretchr/testify - version: 976c720a22c8eb4eb6a0b4348ad85ad12491a506 + version: 34c6fa2dc70986bccbbffcc6130f6920a924b075 subpackages: - assert - mock @@ -133,12 +151,12 @@ imports: - salsa20/salsa - ssh/terminal - name: golang.org/x/net - version: 9b4f9f5ad5197c79fd623a3638e70d8b26cef344 + version: f4e77d36d62c17c2336347bb2670ddbd02d092b7 subpackages: - context - context/ctxhttp - name: golang.org/x/oauth2 - version: 9dcd33a902f40452422c2367fefcb95b54f9f8f8 + version: 9f3314589c9a9136388751d9adae6b0ed400978a subpackages: - google - internal @@ -149,8 +167,13 @@ imports: subpackages: - unix - windows +- name: golang.org/x/text + version: 342b2e1fbaa52c93f31447ad2c6abc048c63e475 + subpackages: + - transform + - unicode/norm - name: google.golang.org/appengine - version: ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06 + version: 54a98f90d1c46b7731eb8fb305d2a321c30ef610 subpackages: - internal - internal/app_identity @@ -162,5 +185,5 @@ imports: - internal/urlfetch - urlfetch - name: gopkg.in/yaml.v2 - version: 7ad95dd0798a40da1ccdff6dff35fd177b5edf40 + version: 51d6538a90f86fe93ac480b35f37b2be17fef232 testImports: [] diff --git a/glide.yaml b/glide.yaml index 38ebe592c..c61381d7f 100644 --- a/glide.yaml +++ b/glide.yaml @@ -9,11 +9,11 @@ import: - package: github.com/spf13/pflag version: v1.0.0 - package: github.com/stellar/go - version: a45d1ae036357adf337060c7b15dbe9abc235025 + version: horizonclient-v1.1.0 subpackages: - build - clients/horizon - - exp/clients/horizon + - clients/horizonclient - support/config - support/errors ############################################################## diff --git a/plugins/sdexExtensions.go b/plugins/sdexExtensions.go index 73f847c66..70fdcf08b 100644 --- a/plugins/sdexExtensions.go +++ b/plugins/sdexExtensions.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/stellar/go/exp/clients/horizon" + "github.com/stellar/go/clients/horizonclient" hProtocol "github.com/stellar/go/protocols/horizon" )