From 3841e07bfc5b23b36df1a59fb094db7194fab1a6 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@monax.io>
Date: Mon, 25 Jun 2018 14:45:52 +0100
Subject: [PATCH] Fix IAVL version and remove redundancy from Makefile
Signed-off-by: Silas Davis <silas@monax.io>
---
Gopkg.lock | 2 +-
Gopkg.toml | 2 +-
Makefile | 10 ++--------
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/Gopkg.lock b/Gopkg.lock
index e5baf1e4..30aac009 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -532,6 +532,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
- inputs-digest = "5427bb653536a3dcbc91e70991f2a1d9577d9198204fa84c73adc854d93cdf0a"
+ inputs-digest = "ef2abf85870ab16c7ec56ad383638fe151996472e942921b51e6190a1f454013"
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 2f689175..34827290 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -26,7 +26,7 @@
[[constraint]]
name = "github.com/tendermint/iavl"
- branch = "develop"
+ version = "=0.8.0-rc0"
[[constraint]]
name = "github.com/prometheus/client_golang"
diff --git a/Makefile b/Makefile
index 0a61ec9d..bf0faf06 100644
--- a/Makefile
+++ b/Makefile
@@ -72,12 +72,6 @@ protobuf_deps:
%.pb.go: %.proto
protoc -I ${GOPATH}/src ${REPO}/$< --go_out=plugins=grpc:${GOPATH}/src
-keys/pbkeys/keys.pb.go: keys/pbkeys/keys.proto
-
-rpc/burrow/burrow.pb.go: rpc/burrow/burrow.proto
-
-execution/events/events.pb.go: execution/events/events.proto
-
.PHONY: protobuf
protobuf: $(PROTO_GO_FILES)
@@ -126,7 +120,7 @@ build_race: check build_race_db build_race_client
# build burrow
.PHONY: build_db
-build_db: commit_hash
+build_db: commit_hash protobuf
go build -ldflags "-extldflags '-static' \
-X github.com/hyperledger/burrow/project.commit=$(shell cat commit_hash.txt)" \
-o ${REPO}/bin/burrow ./cmd/burrow
@@ -137,7 +131,7 @@ install_db: build_db
# build burrow-client
.PHONY: build_client
-build_client: commit_hash
+build_client: commit_hash protobuf
go build -ldflags "-extldflags '-static' \
-X github.com/hyperledger/burrow/project.commit=$(shell cat commit_hash.txt)" \
-o ${REPO}/bin/burrow-client ./client/cmd/burrow-client
--
GitLab