From 4c4da93ef33547d099f6659613bdd119f4a98853 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Fri, 10 Jul 2020 14:19:34 -0400 Subject: [PATCH 1/2] bump lbry.go dependency to be compatible with internal-apis dependency bump --- go.mod | 2 +- go.sum | 4 ++-- manager/ytsync.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d4e3139..558dc66 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/hashicorp/golang-lru v0.5.3 // indirect github.com/hashicorp/memberlist v0.1.5 // indirect github.com/hashicorp/serf v0.8.5 // indirect - github.com/lbryio/lbry.go/v2 v2.6.0 + github.com/lbryio/lbry.go/v2 v2.6.1-0.20200710180140-fcade7475323 github.com/lbryio/reflector.go v1.0.6-0.20190828131602-ce3d4403dbc6 github.com/miekg/dns v1.1.22 // indirect github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b diff --git a/go.sum b/go.sum index c351313..5ba9dde 100644 --- a/go.sum +++ b/go.sum @@ -189,8 +189,8 @@ github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c/go.mod h1:muH7wpU github.com/lbryio/lbry.go v0.0.0-20190828131228-f3a1fbdd5303/go.mod h1:qR+Ui0hYhemIU4fXqM3d1P9eiaRFlof777VJgV7KJ8w= github.com/lbryio/lbry.go v1.1.2 h1:Dyxc+glT/rVWJwHfIf7vjlPYYbjzrQz5ARmJd5Hp69c= github.com/lbryio/lbry.go v1.1.2/go.mod h1:JtyI30bU51rm0LZ/po3mQuzf++14OWb6kR/6mMRAmKU= -github.com/lbryio/lbry.go/v2 v2.6.0 h1:qC2NsSZH2AeNDOP0Dw62cKNqHPy1eEDladmgnhOrIQc= -github.com/lbryio/lbry.go/v2 v2.6.0/go.mod h1:LgFKEpZzJE72DVgSXXfg+2IGOhrC9Lzj6eLma18iNz8= +github.com/lbryio/lbry.go/v2 v2.6.1-0.20200710180140-fcade7475323 h1:Fvngg+hybcA1O2783YBw07S2MGpemSO+vWYSk97QHdM= +github.com/lbryio/lbry.go/v2 v2.6.1-0.20200710180140-fcade7475323/go.mod h1:LgFKEpZzJE72DVgSXXfg+2IGOhrC9Lzj6eLma18iNz8= github.com/lbryio/lbrycrd.go v0.0.0-20200203050410-e1076f12bf19 h1:/zWD8dVIl7bV1TdJWqPqy9tpqixzX2Qxgit48h3hQcY= github.com/lbryio/lbrycrd.go v0.0.0-20200203050410-e1076f12bf19/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/lbryio/lbryschema.go v0.0.0-20190428231007-c54836bca002/go.mod h1:dAzPCBj3CKKWBGYBZxK6tKBP5SCgY2tqd9SnQd/OyKo= diff --git a/manager/ytsync.go b/manager/ytsync.go index 766092e..a1de795 100644 --- a/manager/ytsync.go +++ b/manager/ytsync.go @@ -1255,7 +1255,7 @@ func (s *Sync) getUnsentSupports() (float64, error) { if err != nil { return 0, errors.Err(err) } - transactionList, err := s.daemon.TransactionList(&defaultAccount, 1, 90000) + transactionList, err := s.daemon.TransactionList(&defaultAccount, nil, 1, 90000) if err != nil { return 0, errors.Err(err) } From bfcfe5f36b324d455bd162092c42359954343017 Mon Sep 17 00:00:00 2001 From: Niko Storni Date: Tue, 21 Jul 2020 16:59:09 -0400 Subject: [PATCH 2/2] fix e2e --- e2e/data_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/data_setup.sh b/e2e/data_setup.sh index d6365d3..e15c1db 100755 --- a/e2e/data_setup.sh +++ b/e2e/data_setup.sh @@ -20,5 +20,5 @@ ADDYTSYNCAUTHTOKEN='INSERT INTO auth_token (user_id, value) VALUE(2,"youtubertok mysql -u lbry -plbry -D lbry -h "127.0.0.1" -P 15500 -e "$ADDYTSYNCAUTHTOKEN" #Add their youtube channel to be synced ADDYTCHANNEL="INSERT INTO youtube_data (user_id, status_token,desired_lbry_channel,channel_id,channel_name,status,created_at,source,total_videos,total_subscribers,should_sync,redeemable) -VALUE(2,'3qzGyuVjQaf7t4pKKu2Er1NRW2LJkeWw','@beamertest','UCNQfQvFMPnInwsU_iGYArJQ','BeamerAtLBRY','queued','2019-08-01 00:00:00','sync',1,0,1,1)" +VALUE(2,'3qzGyuVjQaf7t4pKKu2Er1NRW2LJkeWw','@beamertest','UCNQfQvFMPnInwsU_iGYArJQ','BeamerAtLBRY','queued','2019-08-01 00:00:00','sync',10,10,1,1)" mysql -u lbry -plbry -D lbry -h "127.0.0.1" -P 15500 -e "$ADDYTCHANNEL"