Skip to main content

Browse the archive

Revision 85244a42ea306dafef90a73405202825076e7173 authored by Callum Waters on 28 January 2020, 16:16:16 UTC, committed by Anton Kaliaev on 28 January 2020, 16:16:16 UTC 
lite2: refactor cleanup() (#4343)
 
* lite2: add Start method

There are few reasons to do that:

1) separation of state and dynamics (some users will want to delay
   starting the light client; does not matter we should not allow them
   to create a light client object)
2) less important, but some users might not need autoUpdateRoutine and
   removeNoLongerTrustedHeadersRoutine routines

* lite2: wait till routines are finished in Stop

because they are started in Start, it feels more natural to wait for
them to finish in Stop.

* lite2: add TrustedValidatorSet func

* refactor cleanup code

* changed restore header and val function to handle negative height

* reverted restoreTrustedHeaderAndNextVals() functionality

Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
1 parent c5ecd80
Raw File
tools.mk 
###
# Find OS and Go environment
# GO contains the Go binary
# FS contains the OS file separator
###
ifeq ($(OS),Windows_NT)
  GO := $(shell where go.exe 2> NUL)
  FS := "\\"
else
  GO := $(shell command -v go 2> /dev/null)
  FS := "/"
endif

ifeq ($(GO),)
  $(error could not find go. Is it in PATH? $(GO))
endif

GOPATH ?= $(shell $(GO) env GOPATH)
GITHUBDIR := $(GOPATH)$(FS)src$(FS)github.com

###
# Functions
###

go_get = $(if $(findstring Windows_NT,$(OS)),\
IF NOT EXIST $(GITHUBDIR)$(FS)$(1)$(FS) ( mkdir $(GITHUBDIR)$(FS)$(1) ) else (cd .) &\
IF NOT EXIST $(GITHUBDIR)$(FS)$(1)$(FS)$(2)$(FS) ( cd $(GITHUBDIR)$(FS)$(1) && git clone https://github.com/$(1)/$(2) ) else (cd .) &\
,\
mkdir -p $(GITHUBDIR)$(FS)$(1) &&\
(test ! -d $(GITHUBDIR)$(FS)$(1)$(FS)$(2) && cd $(GITHUBDIR)$(FS)$(1) && git clone https://github.com/$(1)/$(2)) || true &&\
)\
cd $(GITHUBDIR)$(FS)$(1)$(FS)$(2) && git fetch origin && git checkout -q $(3)

mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
mkfile_dir := $(shell cd $(shell dirname $(mkfile_path)); pwd)

###
# Go tools
###

TOOLS_DESTDIR  ?= $(GOPATH)/bin

CERTSTRAP     = $(TOOLS_DESTDIR)/certstrap
PROTOBUF     	= $(TOOLS_DESTDIR)/protoc
GOODMAN 			= $(TOOLS_DESTDIR)/goodman

all: tools

tools: certstrap protobuf goodman

check: check_tools

check_tools:
	@# https://stackoverflow.com/a/25668869
	@echo "Found tools: $(foreach tool,$(notdir $(GOTOOLS)),\
        $(if $(shell which $(tool)),$(tool),$(error "No $(tool) in PATH")))"

certstrap: $(CERTSTRAP)
$(CERTSTRAP):
	@echo "Get Certstrap"
	@go get github.com/square/certstrap@v1.2.0

protobuf: $(PROTOBUF)
$(PROTOBUF):
	@echo "Get GoGo Protobuf"
	@go get github.com/gogo/protobuf/protoc-gen-gogo@v1.3.1

goodman: $(GOODMAN)
$(GOODMAN):
	@echo "Get Goodman"
	@go get github.com/snikch/goodman/cmd/goodman@10e37e294daa3c9a90abded60ff9924bafab3888

tools-clean:
	rm -f $(CERTSTRAP) $(PROTOBUF) $(GOX) $(GOODMAN)
	rm -f tools-stamp
	rm -rf /usr/local/include/google/protobuf
	rm -f /usr/local/bin/protoc

###
# Non Go tools
###

# Choose protobuf binary based on OS (only works for 64bit Linux and Mac).
# NOTE: On Mac, installation via brew (brew install protoc) might be favorable.
PROTOC_ZIP=""
ifneq ($(OS),Windows_NT)
		UNAME_S := $(shell uname -s)
		ifeq ($(UNAME_S),Linux)
			PROTOC_ZIP="protoc-3.10.1-linux-x86_64.zip"
		endif
		ifeq ($(UNAME_S),Darwin)
			PROTOC_ZIP="protoc-3.10.1-osx-x86_64.zip"
		endif
endif

protoc:
	@echo "Get Protobuf"
	@echo "In case of any errors, please install directly from https://github.com/protocolbuffers/protobuf/releases"
	@curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.10.1/$(PROTOC_ZIP)
	@unzip -o $(PROTOC_ZIP) -d /usr/local bin/protoc
	@unzip -o $(PROTOC_ZIP) -d /usr/local 'include/*'
	@rm -f $(PROTOC_ZIP)

.PHONY: all tools tools-clean protoc
back to top