From ebc543ebe3598045b15506984d99acc138ec06eb Mon Sep 17 00:00:00 2001 From: Petabyte Storage Date: Fri, 1 Dec 2017 09:51:37 -0800 Subject: [PATCH 1/3] fix warnings --- pubsub/query/parser_test.go | 4 ++-- pubsub/query/query_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pubsub/query/parser_test.go b/pubsub/query/parser_test.go index 165ddda7b..e31079b43 100644 --- a/pubsub/query/parser_test.go +++ b/pubsub/query/parser_test.go @@ -83,9 +83,9 @@ func TestParser(t *testing.T) { for _, c := range cases { _, err := query.New(c.query) if c.valid { - assert.NoError(t, err, "Query was '%s'", c.query) + assert.NoErrorf(t, err, "Query was '%s'", c.query) } else { - assert.Error(t, err, "Query was '%s'", c.query) + assert.Errorf(t, err, "Query was '%s'", c.query) } } } diff --git a/pubsub/query/query_test.go b/pubsub/query/query_test.go index b16abdafa..b980a79c0 100644 --- a/pubsub/query/query_test.go +++ b/pubsub/query/query_test.go @@ -71,9 +71,9 @@ func TestConditions(t *testing.T) { s string conditions []query.Condition }{ - {"tm.events.type='NewBlock'", []query.Condition{query.Condition{"tm.events.type", query.OpEqual, "NewBlock"}}}, - {"tx.gas > 7 AND tx.gas < 9", []query.Condition{query.Condition{"tx.gas", query.OpGreater, int64(7)}, query.Condition{"tx.gas", query.OpLess, int64(9)}}}, - {"tx.time >= TIME 2013-05-03T14:45:00Z", []query.Condition{query.Condition{"tx.time", query.OpGreaterEqual, txTime}}}, + {s: "tm.events.type='NewBlock'", conditions: []query.Condition{query.Condition{Tag: "tm.events.type", Op: query.OpEqual, Operand: "NewBlock"}}}, + {s: "tx.gas > 7 AND tx.gas < 9", conditions: []query.Condition{query.Condition{Tag: "tx.gas", Op: query.OpGreater, Operand: int64(7)}, query.Condition{Tag: "tx.gas", Op: query.OpLess, Operand: int64(9)}}}, + {s: "tx.time >= TIME 2013-05-03T14:45:00Z", conditions: []query.Condition{query.Condition{Tag: "tx.time", Op: query.OpGreaterEqual, Operand: txTime}}}, } for _, tc := range testCases { From 4769719a4b3fbe401b9e5bdf49418d32fa027119 Mon Sep 17 00:00:00 2001 From: Petabyte Storage Date: Mon, 4 Dec 2017 08:54:19 -0800 Subject: [PATCH 2/3] fix Errorf --- glide.lock | 40 ++++++++++++++++++------------------- pubsub/query/parser_test.go | 4 ++-- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/glide.lock b/glide.lock index b0b3ff3c7..9f8ddf0e8 100644 --- a/glide.lock +++ b/glide.lock @@ -1,10 +1,10 @@ hash: 6efda1f3891a7211fc3dc1499c0079267868ced9739b781928af8e225420f867 -updated: 2017-08-11T20:28:34.550901198Z +updated: 2017-12-04T08:45:29.247829134-08:00 imports: - name: github.com/fsnotify/fsnotify version: 4da3e2cfbabc9f751898f250b49f2439785783a1 - name: github.com/go-kit/kit - version: 0873e56b0faeae3a1d661b10d629135508ea5504 + version: d67bb4c202e3b91377d1079b110a6c9ce23ab2f8 subpackages: - log - log/level @@ -18,11 +18,11 @@ imports: - name: github.com/go-playground/universal-translator version: 71201497bace774495daed26a3874fd339e0b538 - name: github.com/go-stack/stack - version: 7a2f19628aabfe68f0766b59e74d6315f8347d22 + version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 - name: github.com/golang/snappy version: 553a641470496b2327abcac10b36396bd98e45c9 - name: github.com/hashicorp/hcl - version: a4b07c25de5ff55ad3b8936cea69a79a3d95a855 + version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8 subpackages: - hcl/ast - hcl/parser @@ -39,33 +39,31 @@ imports: - name: github.com/kr/logfmt version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 - name: github.com/magiconair/properties - version: 51463bfca2576e06c62a8504b5c0f06d61312647 + version: 8d7837e64d3c1ee4e54a880c5a920ab4316fc90a - name: github.com/mattn/go-colorable - version: ded68f7a9561c023e790de24279db7ebf473ea80 + version: 6fcc0c1fd9b620311d821b106a400b35dc95c497 - name: github.com/mattn/go-isatty - version: fc9e8d8ef48496124e79ae0df75490096eccf6fe + version: a5cdd64afdee435007ee3e9f6ed4684af949d568 - name: github.com/mitchellh/mapstructure - version: cc8532a8e9a55ea36402aa21efdf403a60d34096 -- name: github.com/pelletier/go-buffruneio - version: c37440a7cf42ac63b919c752ca73a85067e05992 + version: 06020f85339e21b2478f756a78e295255ffa4d6a - name: github.com/pelletier/go-toml - version: 97253b98df84f9eef872866d079e74b8265150f1 + version: 4e9e0ee19b60b13eb79915933f44d8ed5f268bdd - name: github.com/pkg/errors - version: c605e284fe17294bda444b34710735b29d1a9d90 + version: 645ef00459ed84a119197bfb8d8205042c6df63d - name: github.com/spf13/afero - version: 9be650865eab0c12963d8753212f4f9c66cdcf12 + version: 5660eeed305fe5f69c8fc6cf899132a459a97064 subpackages: - mem - name: github.com/spf13/cast version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 - name: github.com/spf13/cobra - version: db6b9a8b3f3f400c8ecb4a4d7d02245b8facad66 + version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b - name: github.com/spf13/jwalterweatherman - version: fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66 + version: 12bd96e66386c1960ab0f74ced1362f66f552f7b - name: github.com/spf13/pflag version: 80fe0fb4eba54167e2ccae1c6c950e72abf61b73 - name: github.com/spf13/viper - version: 0967fc9aceab2ce9da34061253ac10fb99bba5b2 + version: 25b30aa063fc18e48662b86996252eabdcf2f0c7 - name: github.com/syndtr/goleveldb version: 8c81ea47d4c41a385645e133e15510fc6a2a74b4 subpackages: @@ -82,7 +80,7 @@ imports: - leveldb/table - leveldb/util - name: github.com/tendermint/go-wire - version: b53add0b622662731985485f3a19be7f684660b8 + version: 7d50b38b3815efe313728de77e2995c8813ce13f subpackages: - data - data/base58 @@ -91,11 +89,11 @@ imports: subpackages: - term - name: golang.org/x/crypto - version: 5a033cc77e57eca05bdb50522851d29e03569cbe + version: c7af5bf2638a1164f2eb5467c39c6cffbd13a02e subpackages: - ripemd160 - name: golang.org/x/sys - version: 9ccfe848b9db8435a24c424abbc07a921adf1df5 + version: 661970f62f5897bc0cd5fdca7e087ba8a98a8fa1 subpackages: - unix - name: golang.org/x/text @@ -104,9 +102,9 @@ imports: - transform - unicode/norm - name: gopkg.in/go-playground/validator.v9 - version: d529ee1b0f30352444f507cc6cdac96bfd12decc + version: 6d8c18553ea1ac493d049edd6f102f52e618f085 - name: gopkg.in/yaml.v2 - version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b + version: eb3733d160e74a9c7e442f435eb3bea458e1d19f testImports: - name: github.com/davecgh/go-spew version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 diff --git a/pubsub/query/parser_test.go b/pubsub/query/parser_test.go index e31079b43..bf562c0bd 100644 --- a/pubsub/query/parser_test.go +++ b/pubsub/query/parser_test.go @@ -83,9 +83,9 @@ func TestParser(t *testing.T) { for _, c := range cases { _, err := query.New(c.query) if c.valid { - assert.NoErrorf(t, err, "Query was '%s'", c.query) + assert.NoError(t, err, "Query was '"+c.query+"'") } else { - assert.Errorf(t, err, "Query was '%s'", c.query) + assert.Error(t, err, "Query was '"+c.query+"'") } } } From c325ce218293417161ac53152419ebc17b48f132 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Tue, 5 Dec 2017 17:13:10 -0600 Subject: [PATCH 3/3] use NoErrorf and Errorf functions --- glide.lock | 42 ++++++++++++++++++------------------- glide.yaml | 1 - pubsub/query/parser_test.go | 4 ++-- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/glide.lock b/glide.lock index 9f8ddf0e8..4b9c46c77 100644 --- a/glide.lock +++ b/glide.lock @@ -1,10 +1,10 @@ -hash: 6efda1f3891a7211fc3dc1499c0079267868ced9739b781928af8e225420f867 -updated: 2017-12-04T08:45:29.247829134-08:00 +hash: 1f3d3426e823e4a8e6d4473615fcc86c767bbea6da9114ea1e7e0a9f0ccfa129 +updated: 2017-12-05T23:47:13.202024407Z imports: - name: github.com/fsnotify/fsnotify version: 4da3e2cfbabc9f751898f250b49f2439785783a1 - name: github.com/go-kit/kit - version: d67bb4c202e3b91377d1079b110a6c9ce23ab2f8 + version: 53f10af5d5c7375d4655a3d6852457ed17ab5cc7 subpackages: - log - log/level @@ -12,13 +12,13 @@ imports: - name: github.com/go-logfmt/logfmt version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 - name: github.com/go-playground/locales - version: 1e5f1161c6416a5ff48840eb8724a394e48cc534 + version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6 subpackages: - currency - name: github.com/go-playground/universal-translator version: 71201497bace774495daed26a3874fd339e0b538 - name: github.com/go-stack/stack - version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 + version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc - name: github.com/golang/snappy version: 553a641470496b2327abcac10b36396bd98e45c9 - name: github.com/hashicorp/hcl @@ -39,33 +39,33 @@ imports: - name: github.com/kr/logfmt version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 - name: github.com/magiconair/properties - version: 8d7837e64d3c1ee4e54a880c5a920ab4316fc90a + version: 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934 - name: github.com/mattn/go-colorable version: 6fcc0c1fd9b620311d821b106a400b35dc95c497 - name: github.com/mattn/go-isatty - version: a5cdd64afdee435007ee3e9f6ed4684af949d568 + version: 6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c - name: github.com/mitchellh/mapstructure version: 06020f85339e21b2478f756a78e295255ffa4d6a - name: github.com/pelletier/go-toml version: 4e9e0ee19b60b13eb79915933f44d8ed5f268bdd - name: github.com/pkg/errors - version: 645ef00459ed84a119197bfb8d8205042c6df63d + version: f15c970de5b76fac0b59abb32d62c17cc7bed265 - name: github.com/spf13/afero - version: 5660eeed305fe5f69c8fc6cf899132a459a97064 + version: 8d919cbe7e2627e417f3e45c3c0e489a5b7e2536 subpackages: - mem - name: github.com/spf13/cast version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 - name: github.com/spf13/cobra - version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b + version: de2d9c4eca8f3c1de17d48b096b6504e0296f003 - name: github.com/spf13/jwalterweatherman version: 12bd96e66386c1960ab0f74ced1362f66f552f7b - name: github.com/spf13/pflag - version: 80fe0fb4eba54167e2ccae1c6c950e72abf61b73 + version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea - name: github.com/spf13/viper - version: 25b30aa063fc18e48662b86996252eabdcf2f0c7 + version: 4dddf7c62e16bce5807744018f5b753bfe21bbd2 - name: github.com/syndtr/goleveldb - version: 8c81ea47d4c41a385645e133e15510fc6a2a74b4 + version: adf24ef3f94bd13ec4163060b21a5678f22b429b subpackages: - leveldb - leveldb/cache @@ -80,7 +80,7 @@ imports: - leveldb/table - leveldb/util - name: github.com/tendermint/go-wire - version: 7d50b38b3815efe313728de77e2995c8813ce13f + version: 2baffcb6b690057568bc90ef1d457efb150b979a subpackages: - data - data/base58 @@ -89,25 +89,25 @@ imports: subpackages: - term - name: golang.org/x/crypto - version: c7af5bf2638a1164f2eb5467c39c6cffbd13a02e + version: 94eea52f7b742c7cbe0b03b22f0c4c8631ece122 subpackages: - ripemd160 - name: golang.org/x/sys - version: 661970f62f5897bc0cd5fdca7e087ba8a98a8fa1 + version: 8b4580aae2a0dd0c231a45d3ccb8434ff533b840 subpackages: - unix - name: golang.org/x/text - version: 470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4 + version: 57961680700a5336d15015c8c50686ca5ba362a4 subpackages: - transform - unicode/norm - name: gopkg.in/go-playground/validator.v9 - version: 6d8c18553ea1ac493d049edd6f102f52e618f085 + version: 61caf9d3038e1af346dbf5c2e16f6678e1548364 - name: gopkg.in/yaml.v2 - version: eb3733d160e74a9c7e442f435eb3bea458e1d19f + version: 287cf08546ab5e7e37d55a84f7ed3fd1db036de5 testImports: - name: github.com/davecgh/go-spew - version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9 + version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9 subpackages: - spew - name: github.com/pmezard/go-difflib @@ -115,7 +115,7 @@ testImports: subpackages: - difflib - name: github.com/stretchr/testify - version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0 + version: 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f subpackages: - assert - require diff --git a/glide.yaml b/glide.yaml index 22825a273..0d722c853 100644 --- a/glide.yaml +++ b/glide.yaml @@ -26,7 +26,6 @@ import: - package: gopkg.in/go-playground/validator.v9 testImport: - package: github.com/stretchr/testify - version: ^1.1.4 subpackages: - assert - require diff --git a/pubsub/query/parser_test.go b/pubsub/query/parser_test.go index bf562c0bd..e31079b43 100644 --- a/pubsub/query/parser_test.go +++ b/pubsub/query/parser_test.go @@ -83,9 +83,9 @@ func TestParser(t *testing.T) { for _, c := range cases { _, err := query.New(c.query) if c.valid { - assert.NoError(t, err, "Query was '"+c.query+"'") + assert.NoErrorf(t, err, "Query was '%s'", c.query) } else { - assert.Error(t, err, "Query was '"+c.query+"'") + assert.Errorf(t, err, "Query was '%s'", c.query) } } }