From e39187a063f9802786cb03a8a634bd09b89c3fe6 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 14 Mar 2018 21:42:17 +0400 Subject: [PATCH 1/2] add go-amino as source for go-wire --- Gopkg.lock | 3 ++- Gopkg.toml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index 4ab26b6c9..10739e8eb 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -259,6 +259,7 @@ "data" ] revision = "fa721242b042ecd4c6ed1a934ee740db4f74e45c" + source = "github.com/tendermint/go-amino" version = "v0.7.3" [[projects]] @@ -372,6 +373,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "36505c5f341e1e80d7d55589a17727bbd9e89403624b4e02c9e8a21b1ed39d0f" + inputs-digest = "fe167dd9055ba9a4016e7bdad88da263372bca7ebdcebf5c81c609f396e605a3" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index cdc31302b..b963fe13c 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -79,6 +79,7 @@ [[constraint]] name = "github.com/tendermint/go-wire" + source = "github.com/tendermint/go-amino" version = "0.7.3" [[constraint]] From 76e1dd41e40a8a65803f433676a071adaeb0b483 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 14 Mar 2018 21:42:35 +0400 Subject: [PATCH 2/2] fix Makefile's .PHONY --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5fdc6a803..851151eeb 100644 --- a/Makefile +++ b/Makefile @@ -186,6 +186,4 @@ metalinter_all: # To avoid unintended conflicts with file names, always add to .PHONY # unless there is a reason not to. # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html -.PHONY: check build build_race dist install check_tools get_tools update_tools - get_vendor_deps draw_deps test_cover test_apps test_persistence test_p2p test - test_race test_libs test_integrations test_release test100 vagrant_test fmt +.PHONY: check build build_race dist install check_tools get_tools update_tools get_vendor_deps draw_deps test_cover test_apps test_persistence test_p2p test test_race test_libs test_integrations test_release test100 vagrant_test fmt