Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed failing compile #3

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cmd/basecoin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"flag"
"fmt"
"reflect"
"strings"

"github.com/tendermint/basecoin/app"
. "github.com/tendermint/go-common"
Expand All @@ -15,12 +16,19 @@ import (
func main() {

addrPtr := flag.String("address", "tcp://0.0.0.0:46658", "Listen address")
transportPtr := flag.String("transport", "socket", `How to serve tmsp ("socket" or "grpc")`)
eyesPtr := flag.String("eyes", "local", "MerkleEyes address, or 'local' for embedded")
genFilePath := flag.String("genesis", "", "Genesis file, if any")
flag.Parse()

// determine appropriate connection for merkeleyes based on location
eyeTrans := "socket"
if strings.HasPrefix(*eyesPtr, "tcp://") {
eyeTrans = "grpc"
}

// Connect to MerkleEyes
eyesCli, err := eyes.NewClient(*eyesPtr)
eyesCli, err := eyes.NewClient(*eyesPtr, eyeTrans)
if err != nil {
Exit("connect to MerkleEyes: " + err.Error())
}
Expand All @@ -38,7 +46,7 @@ func main() {
}

// Start the listener
svr, err := server.NewServer(*addrPtr, app)
svr, err := server.NewServer(*addrPtr, *transportPtr, app)
if err != nil {
Exit("create listener: " + err.Error())
}
Expand Down
8 changes: 6 additions & 2 deletions tests/tmsp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,16 @@ func testGov() {
})

// Query for validator set
res := bcApp.Query(expr.MustCompile(`x02 x01 "gov/g/validators"`))
txQuery, err := expr.Compile(`x02 x01 "gov/g/validators"`)
if err != nil {
panic(err)
}
res := bcApp.Query(txQuery)
if res.IsErr() {
Exit(Fmt("Failed to query validators: %v", res.Error()))
}
group := govtypes.Group{}
err := wire.ReadBinaryBytes(res.Data, &group)
err = wire.ReadBinaryBytes(res.Data, &group)
if err != nil {
Exit(Fmt("Unexpected query response bytes: %X error: %v",
res.Data, err))
Expand Down