fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-04 11:02:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/tendermint/tendermint2 into develop

Browse Source
This commit is contained in:
Ethan Buchman 2015-04-01 05:13:14 -07:00
commit 25ab73a51a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -3,19 +3,19 @@
all: build all: build
build: get_deps build: get_deps
go build -o tendermint github.com/tendermint/tendermint/cmd go build -o tendermint github.com/tendermint/tendermint2/cmd
build_race: get_deps build_race: get_deps
go build -race -o tendermint github.com/tendermint/tendermint/cmd go build -race -o tendermint github.com/tendermint/tendermint2/cmd
test: build test: build
go test github.com/tendermint/tendermint/... go test github.com/tendermint/tendermint2/...
list_deps: list_deps:
go list -f '{{join .Deps "\n"}}' github.com/tendermint/tendermint/... | xargs go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' go list -f '{{join .Deps "\n"}}' github.com/tendermint/tendermint2/... | xargs go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}'
get_deps: get_deps:
go get github.com/tendermint/tendermint/... go get github.com/tendermint/tendermint2/...
tendermint_root/priv_validator.json: tendermint_root/priv_validator.json.orig tendermint_root/priv_validator.json: tendermint_root/priv_validator.json.orig
cp $< $@ cp $< $@

2
binary/reflect.go
View File

@ -9,7 +9,7 @@ import (
"sync" "sync"
"time" "time"
. "github.com/tendermint/tendermint/common" . "github.com/tendermint/tendermint2/common"
) )
type TypeInfo struct { type TypeInfo struct {

2
rpc/test/.tendermint/priv_validator.json
View File

@ -1 +1 @@
{"Address":"D7DFF9806078899C8DA3FE3633CC0BF3C6C2B1BB","PubKey":[1,"2239C21C81EA7173A6C489145490C015E05D4B97448933B708A7EC5B7B4921E3"],"PrivKey":[1,"FDE3BD94CB327D19464027BA668194C5EFA46AE83E8419D7542CFF41F00C81972239C21C81EA7173A6C489145490C015E05D4B97448933B708A7EC5B7B4921E3"],"LastHeight":3,"LastRound":0,"LastStep":2} {"Address":"D7DFF9806078899C8DA3FE3633CC0BF3C6C2B1BB","PubKey":[1,"2239C21C81EA7173A6C489145490C015E05D4B97448933B708A7EC5B7B4921E3"],"PrivKey":[1,"FDE3BD94CB327D19464027BA668194C5EFA46AE83E8419D7542CFF41F00C81972239C21C81EA7173A6C489145490C015E05D4B97448933B708A7EC5B7B4921E3"]}