Browse Source
Merge pull request #559 from tendermint/release-v0.10.1
Release v0.10.1pull/570/head v0.10.1
Ethan Buchman
7 years ago
committed by
GitHub
GitHub
61 changed files with 577 additions and 928 deletions
Split View
Diff Options
-
+20 -0CHANGELOG.md
-
+56 -0CODE_OF_CONDUCT.md
-
+5 -6DOCKER/Dockerfile
-
+1 -1DOCKER/Dockerfile.develop
-
+2 -6DOCKER/Makefile
-
+4 -3DOCKER/README.md
-
+20 -0DOCKER/build.sh
-
+22 -0DOCKER/push.sh
-
+8 -1Makefile
-
+3 -0README.md
-
+7 -7blockchain/pool.go
-
+6 -7blockchain/reactor.go
-
+0 -87cmd/tendermint/commands/flags/log_level.go
-
+0 -64cmd/tendermint/commands/flags/log_level_test.go
-
+20 -6cmd/tendermint/commands/root.go
-
+26 -33cmd/tendermint/commands/run_node.go
-
+2 -4consensus/byzantine_test.go
-
+6 -0consensus/common.go
-
+0 -21consensus/common_test.go
-
+3 -0consensus/height_vote_set_test.go
-
+4 -4consensus/reactor.go
-
+1 -1consensus/replay.go
-
+0 -61consensus/replay_test.go
-
+11 -14consensus/state.go
-
+10 -7consensus/state_test.go
-
+1 -1consensus/ticker.go
-
+33 -30glide.lock
-
+15 -11glide.yaml
-
+1 -1mempool/mempool.go
-
+1 -1mempool/reactor.go
-
+2 -2node/node.go
-
+1 -4p2p/addrbook.go
-
+8 -8p2p/connection.go
-
+4 -4p2p/listener.go
-
+0 -1p2p/netaddress.go
-
+2 -3p2p/pex_reactor.go
-
+0 -14p2p/secret_connection.go
-
+7 -7p2p/switch.go
-
+6 -5p2p/upnp/probe.go
-
+5 -5p2p/upnp/upnp.go
-
+66 -1rpc/client/event_test.go
-
+2 -2rpc/client/mock/abci.go
-
+91 -0rpc/client/rpc_test.go
-
+1 -1rpc/core/mempool.go
-
+14 -5rpc/lib/client/http_client.go
-
+2 -2rpc/lib/client/ws_client.go
-
+2 -2rpc/lib/rpc_test.go
-
+19 -9rpc/lib/server/handlers.go
-
+1 -1rpc/lib/server/http_server.go
-
+0 -352rpc/test/client_test.go
-
+2 -4rpc/test/grpc_test.go
-
+0 -92rpc/test/helpers.go
-
+1 -1scripts/tendermint-builder/Dockerfile
-
+5 -5state/execution.go
-
+1 -5state/state.go
-
+5 -2state/txindex/kv/kv_test.go
-
+2 -3test/docker/Dockerfile
-
+1 -4types/block.go
-
+33 -1types/genesis.go
-
+4 -4types/validator_set.go
-
+2 -2version/version.go
+ 20
- 0
CHANGELOG.md
View File
+ 56
- 0
CODE_OF_CONDUCT.md
View File
| @ -0,0 +1,56 @@ | |||
| # The Tendermint Code of Conduct | |||
| This code of conduct applies to all projects run by the Tendermint/COSMOS team and hence to tendermint. | |||
| ---- | |||
| # Conduct | |||
| ## Contact: adrian@tendermint.com | |||
| * We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic. | |||
| * On Slack, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all. | |||
| * Please be kind and courteous. There’s no need to be mean or rude. | |||
| * Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer. | |||
| * Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works. | |||
| * We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behaviour. We interpret the term “harassment” as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don’t tolerate behavior that excludes people in socially marginalized groups. | |||
| * Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel admins or the person mentioned above immediately. Whether you’re a regular contributor or a newcomer, we care about making this community a safe place for you and we’ve got your back. | |||
| * Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome. | |||
| ---- | |||
| # Moderation | |||
| These are the policies for upholding our community’s standards of conduct. If you feel that a thread needs moderation, please contact the above mentioned person. | |||
| 1. Remarks that violate the Tendermint/COSMOS standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.) | |||
| 2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed. | |||
| 3. Moderators will first respond to such remarks with a warning. | |||
| 4. If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off. | |||
| 5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded. | |||
| 6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology. | |||
| 7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, in private. Complaints about bans in-channel are not allowed. | |||
| 8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others. | |||
| In the Tendermint/COSMOS community we strive to go the extra step to look out for each other. Don’t just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they’re off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely. | |||
| And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could’ve communicated better — remember that it’s your responsibility to make your fellow Cosmonauts comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust. | |||
| The enforcement policies listed above apply to all official Tendermint/COSMOS venues.For other projects adopting the Tendermint/COSMOS Code of Conduct, please contact the maintainers of those projects for enforcement. If you wish to use this code of conduct for your own project, consider explicitly mentioning your moderation policy or making a copy with your own moderation policy so as to avoid confusion. | |||
| *Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling), the [Contributor Covenant v1.3.0](http://contributor-covenant.org/version/1/3/0/) and the [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html). | |||
+ 5
- 6
DOCKER/Dockerfile
View File
+ 1
- 1
DOCKER/Dockerfile.develop
View File
+ 2
- 6
DOCKER/Makefile
View File
+ 4
- 3
DOCKER/README.md
View File
+ 20
- 0
DOCKER/build.sh
View File
| @ -0,0 +1,20 @@ | |||
| #!/usr/bin/env bash | |||
| set -e | |||
| # Get the tag from the version, or try to figure it out. | |||
| if [ -z "$TAG" ]; then | |||
| TAG=$(awk -F\" '/Version =/ { print $2; exit }' < ../version/version.go) | |||
| fi | |||
| if [ -z "$TAG" ]; then | |||
| echo "Please specify a tag." | |||
| exit 1 | |||
| fi | |||
| TAG_NO_PATCH=${TAG%.*} | |||
| read -p "==> Build 3 docker images with the following tags (latest, $TAG, $TAG_NO_PATCH)? y/n" -n 1 -r | |||
| echo | |||
| if [[ $REPLY =~ ^[Yy]$ ]] | |||
| then | |||
| docker build -t "tendermint/tendermint" -t "tendermint/tendermint:$TAG" -t "tendermint/tendermint:$TAG_NO_PATCH" . | |||
| fi | |||
+ 22
- 0
DOCKER/push.sh
View File
| @ -0,0 +1,22 @@ | |||
| #!/usr/bin/env bash | |||
| set -e | |||
| # Get the tag from the version, or try to figure it out. | |||
| if [ -z "$TAG" ]; then | |||
| TAG=$(awk -F\" '/Version =/ { print $2; exit }' < ../version/version.go) | |||
| fi | |||
| if [ -z "$TAG" ]; then | |||
| echo "Please specify a tag." | |||
| exit 1 | |||
| fi | |||
| TAG_NO_PATCH=${TAG%.*} | |||
| read -p "==> Push 3 docker images with the following tags (latest, $TAG, $TAG_NO_PATCH)? y/n" -n 1 -r | |||
| echo | |||
| if [[ $REPLY =~ ^[Yy]$ ]] | |||
| then | |||
| docker push "tendermint/tendermint:latest" | |||
| docker push "tendermint/tendermint:$TAG" | |||
| docker push "tendermint/tendermint:$TAG_NO_PATCH" | |||
| fi | |||
+ 8
- 1
Makefile
View File
+ 3
- 0
README.md
View File
+ 7
- 7
blockchain/pool.go
View File
+ 6
- 7
blockchain/reactor.go
View File
+ 0
- 87
cmd/tendermint/commands/flags/log_level.go
View File
| @ -1,87 +0,0 @@ | |||
| package flags | |||
| import ( | |||
| "fmt" | |||
| "strings" | |||
| "github.com/pkg/errors" | |||
| cfg "github.com/tendermint/tendermint/config" | |||
| "github.com/tendermint/tmlibs/log" | |||
| ) | |||
| const ( | |||
| defaultLogLevelKey = "*" | |||
| ) | |||
| // ParseLogLevel parses complex log level - comma-separated | |||
| // list of module:level pairs with an optional *:level pair (* means | |||
| // all other modules). | |||
| // | |||
| // Example: | |||
| // ParseLogLevel("consensus:debug,mempool:debug,*:error", log.NewTMLogger(os.Stdout)) | |||
| func ParseLogLevel(lvl string, logger log.Logger) (log.Logger, error) { | |||
| if lvl == "" { | |||
| return nil, errors.New("Empty log level") | |||
| } | |||
| l := lvl | |||
| // prefix simple one word levels (e.g. "info") with "*" | |||
| if !strings.Contains(l, ":") { | |||
| l = defaultLogLevelKey + ":" + l | |||
| } | |||
| options := make([]log.Option, 0) | |||
| isDefaultLogLevelSet := false | |||
| var option log.Option | |||
| var err error | |||
| list := strings.Split(l, ",") | |||
| for _, item := range list { | |||
| moduleAndLevel := strings.Split(item, ":") | |||
| if len(moduleAndLevel) != 2 { | |||
| return nil, fmt.Errorf("Expected list in a form of \"module:level\" pairs, given pair %s, list %s", item, list) | |||
| } | |||
| module := moduleAndLevel[0] | |||
| level := moduleAndLevel[1] | |||
| if module == defaultLogLevelKey { | |||
| option, err = log.AllowLevel(level) | |||
| if err != nil { | |||
| return nil, errors.Wrap(err, fmt.Sprintf("Failed to parse default log level (pair %s, list %s)", item, l)) | |||
| } | |||
| options = append(options, option) | |||
| isDefaultLogLevelSet = true | |||
| } else { | |||
| switch level { | |||
| case "debug": | |||
| option = log.AllowDebugWith("module", module) | |||
| case "info": | |||
| option = log.AllowInfoWith("module", module) | |||
| case "error": | |||
| option = log.AllowErrorWith("module", module) | |||
| case "none": | |||
| option = log.AllowNoneWith("module", module) | |||
| default: | |||
| return nil, fmt.Errorf("Expected either \"info\", \"debug\", \"error\" or \"none\" log level, given %s (pair %s, list %s)", level, item, list) | |||
| } | |||
| options = append(options, option) | |||
| } | |||
| } | |||
| // if "*" is not provided, set default global level | |||
| if !isDefaultLogLevelSet { | |||
| option, err = log.AllowLevel(cfg.DefaultLogLevel()) | |||
| if err != nil { | |||
| return nil, err | |||
| } | |||
| options = append(options, option) | |||
| } | |||
| return log.NewFilter(logger, options...), nil | |||
| } | |||
+ 0
- 64
cmd/tendermint/commands/flags/log_level_test.go
View File
| @ -1,64 +0,0 @@ | |||
| package flags_test | |||
| import ( | |||
| "bytes" | |||
| "strings" | |||
| "testing" | |||
| tmflags "github.com/tendermint/tendermint/cmd/tendermint/commands/flags" | |||
| "github.com/tendermint/tmlibs/log" | |||
| ) | |||
| func TestParseLogLevel(t *testing.T) { | |||
| var buf bytes.Buffer | |||
| jsonLogger := log.NewTMJSONLogger(&buf) | |||
| correctLogLevels := []struct { | |||
| lvl string | |||
| expectedLogLines []string | |||
| }{ | |||
| {"mempool:error", []string{``, ``, `{"_msg":"Mesmero","level":"error","module":"mempool"}`}}, | |||
| {"mempool:error,*:debug", []string{``, ``, `{"_msg":"Mesmero","level":"error","module":"mempool"}`}}, | |||
| {"*:debug,wire:none", []string{ | |||
| `{"_msg":"Kingpin","level":"debug","module":"mempool"}`, | |||
| `{"_msg":"Kitty Pryde","level":"info","module":"mempool"}`, | |||
| `{"_msg":"Mesmero","level":"error","module":"mempool"}`}}, | |||
| } | |||
| for _, c := range correctLogLevels { | |||
| logger, err := tmflags.ParseLogLevel(c.lvl, jsonLogger) | |||
| if err != nil { | |||
| t.Fatal(err) | |||
| } | |||
| logger = logger.With("module", "mempool") | |||
| buf.Reset() | |||
| logger.Debug("Kingpin") | |||
| if have := strings.TrimSpace(buf.String()); c.expectedLogLines[0] != have { | |||
| t.Errorf("\nwant '%s'\nhave '%s'\nlevel '%s'", c.expectedLogLines[0], have, c.lvl) | |||
| } | |||
| buf.Reset() | |||
| logger.Info("Kitty Pryde") | |||
| if have := strings.TrimSpace(buf.String()); c.expectedLogLines[1] != have { | |||
| t.Errorf("\nwant '%s'\nhave '%s'\nlevel '%s'", c.expectedLogLines[1], have, c.lvl) | |||
| } | |||
| buf.Reset() | |||
| logger.Error("Mesmero") | |||
| if have := strings.TrimSpace(buf.String()); c.expectedLogLines[2] != have { | |||
| t.Errorf("\nwant '%s'\nhave '%s'\nlevel '%s'", c.expectedLogLines[2], have, c.lvl) | |||
| } | |||
| } | |||
| incorrectLogLevel := []string{"some", "mempool:some", "*:some,mempool:error"} | |||
| for _, lvl := range incorrectLogLevel { | |||
| if _, err := tmflags.ParseLogLevel(lvl, jsonLogger); err == nil { | |||
| t.Fatalf("Expected %s to produce error", lvl) | |||
| } | |||
| } | |||
| } | |||
+ 20
- 6
cmd/tendermint/commands/root.go
View File
+ 26
- 33
cmd/tendermint/commands/run_node.go
View File
+ 2
- 4
consensus/byzantine_test.go
View File
+ 6
- 0
consensus/common.go
View File
+ 0
- 21
consensus/common_test.go
View File
+ 3
- 0
consensus/height_vote_set_test.go
View File
+ 4
- 4
consensus/reactor.go
View File
+ 1
- 1
consensus/replay.go
View File
+ 0
- 61
consensus/replay_test.go
View File
+ 11
- 14
consensus/state.go
View File
+ 10
- 7
consensus/state_test.go
View File
+ 1
- 1
consensus/ticker.go
View File
+ 33
- 30
glide.lock
View File
+ 15
- 11
glide.yaml
View File
+ 1
- 1
mempool/mempool.go
View File
+ 1
- 1
mempool/reactor.go
View File
+ 2
- 2
node/node.go
View File
+ 1
- 4
p2p/addrbook.go
View File
+ 8
- 8
p2p/connection.go
View File
+ 4
- 4
p2p/listener.go
View File
+ 0
- 1
p2p/netaddress.go
View File
+ 2
- 3
p2p/pex_reactor.go
View File
+ 0
- 14
p2p/secret_connection.go
View File
+ 7
- 7
p2p/switch.go
View File
+ 6
- 5
p2p/upnp/probe.go
View File
+ 5
- 5
p2p/upnp/upnp.go
View File
+ 66
- 1
rpc/client/event_test.go
View File
+ 2
- 2
rpc/client/mock/abci.go
View File
+ 91
- 0
rpc/client/rpc_test.go
View File
+ 1
- 1
rpc/core/mempool.go
View File
+ 14
- 5
rpc/lib/client/http_client.go
View File
+ 2
- 2
rpc/lib/client/ws_client.go
View File
+ 2
- 2
rpc/lib/rpc_test.go
View File
+ 19
- 9
rpc/lib/server/handlers.go
View File
+ 1
- 1
rpc/lib/server/http_server.go
View File
+ 0
- 352
rpc/test/client_test.go
View File
| @ -1,352 +0,0 @@ | |||
| package rpctest | |||
| import ( | |||
| "bytes" | |||
| crand "crypto/rand" | |||
| "fmt" | |||
| "math/rand" | |||
| "testing" | |||
| "time" | |||
| "github.com/stretchr/testify/assert" | |||
| "github.com/stretchr/testify/require" | |||
| abci "github.com/tendermint/abci/types" | |||
| "github.com/tendermint/go-wire/data" | |||
| . "github.com/tendermint/tmlibs/common" | |||
| "github.com/tendermint/tendermint/rpc/core" | |||
| ctypes "github.com/tendermint/tendermint/rpc/core/types" | |||
| rpc "github.com/tendermint/tendermint/rpc/lib/client" | |||
| "github.com/tendermint/tendermint/state/txindex/null" | |||
| "github.com/tendermint/tendermint/types" | |||
| ) | |||
| //-------------------------------------------------------------------------------- | |||
| // Test the HTTP client | |||
| // These tests assume the dummy app | |||
| //-------------------------------------------------------------------------------- | |||
| //-------------------------------------------------------------------------------- | |||
| // status | |||
| func TestURIStatus(t *testing.T) { | |||
| testStatus(t, GetURIClient()) | |||
| } | |||
| func TestJSONStatus(t *testing.T) { | |||
| testStatus(t, GetJSONClient()) | |||
| } | |||
| func testStatus(t *testing.T, client rpc.HTTPClient) { | |||
| moniker := GetConfig().Moniker | |||
| result := new(ctypes.ResultStatus) | |||
| _, err := client.Call("status", map[string]interface{}{}, result) | |||
| require.Nil(t, err) | |||
| assert.Equal(t, moniker, result.NodeInfo.Moniker) | |||
| } | |||
| //-------------------------------------------------------------------------------- | |||
| // broadcast tx sync | |||
| // random bytes (excluding byte('=')) | |||
| func randBytes(t *testing.T) []byte { | |||
| n := rand.Intn(10) + 2 | |||
| buf := make([]byte, n) | |||
| _, err := crand.Read(buf) | |||
| require.Nil(t, err) | |||
| return bytes.Replace(buf, []byte("="), []byte{100}, -1) | |||
| } | |||
| func TestURIBroadcastTxSync(t *testing.T) { | |||
| testBroadcastTxSync(t, GetURIClient()) | |||
| } | |||
| func TestJSONBroadcastTxSync(t *testing.T) { | |||
| testBroadcastTxSync(t, GetJSONClient()) | |||
| } | |||
| func testBroadcastTxSync(t *testing.T, client rpc.HTTPClient) { | |||
| mem := node.MempoolReactor().Mempool | |||
| initMemSize := mem.Size() | |||
| result := new(ctypes.ResultBroadcastTx) | |||
| tx := randBytes(t) | |||
| _, err := client.Call("broadcast_tx_sync", map[string]interface{}{"tx": tx}, result) | |||
| require.Nil(t, err) | |||
| require.Equal(t, abci.CodeType_OK, result.Code) | |||
| require.Equal(t, initMemSize+1, mem.Size()) | |||
| txs := mem.Reap(1) | |||
| require.EqualValues(t, tx, txs[0]) | |||
| mem.Flush() | |||
| } | |||
| //-------------------------------------------------------------------------------- | |||
| // query | |||
| func testTxKV(t *testing.T) ([]byte, []byte, types.Tx) { | |||
| k := randBytes(t) | |||
| v := randBytes(t) | |||
| return k, v, types.Tx(Fmt("%s=%s", k, v)) | |||
| } | |||
| func sendTx(t *testing.T, client rpc.HTTPClient) ([]byte, []byte) { | |||
| result := new(ctypes.ResultBroadcastTxCommit) | |||
| k, v, tx := testTxKV(t) | |||
| _, err := client.Call("broadcast_tx_commit", map[string]interface{}{"tx": tx}, result) | |||
| require.Nil(t, err) | |||
| require.NotNil(t, 0, result.DeliverTx, "%#v", result) | |||
| require.EqualValues(t, 0, result.CheckTx.Code, "%#v", result) | |||
| require.EqualValues(t, 0, result.DeliverTx.Code, "%#v", result) | |||
| return k, v | |||
| } | |||
| func TestURIABCIQuery(t *testing.T) { | |||
| testABCIQuery(t, GetURIClient()) | |||
| } | |||
| func TestJSONABCIQuery(t *testing.T) { | |||
| testABCIQuery(t, GetJSONClient()) | |||
| } | |||
| func testABCIQuery(t *testing.T, client rpc.HTTPClient) { | |||
| k, _ := sendTx(t, client) | |||
| time.Sleep(time.Millisecond * 500) | |||
| result := new(ctypes.ResultABCIQuery) | |||
| _, err := client.Call("abci_query", | |||
| map[string]interface{}{"path": "", "data": data.Bytes(k), "prove": false}, result) | |||
| require.Nil(t, err) | |||
| require.EqualValues(t, 0, result.Code) | |||
| // XXX: specific to value returned by the dummy | |||
| require.NotEqual(t, 0, len(result.Value)) | |||
| } | |||
| //-------------------------------------------------------------------------------- | |||
| // broadcast tx commit | |||
| func TestURIBroadcastTxCommit(t *testing.T) { | |||
| testBroadcastTxCommit(t, GetURIClient()) | |||
| } | |||
| func TestJSONBroadcastTxCommit(t *testing.T) { | |||
| testBroadcastTxCommit(t, GetJSONClient()) | |||
| } | |||
| func testBroadcastTxCommit(t *testing.T, client rpc.HTTPClient) { | |||
| require := require.New(t) | |||
| result := new(ctypes.ResultBroadcastTxCommit) | |||
| tx := randBytes(t) | |||
| _, err := client.Call("broadcast_tx_commit", map[string]interface{}{"tx": tx}, result) | |||
| require.Nil(err) | |||
| checkTx := result.CheckTx | |||
| require.Equal(abci.CodeType_OK, checkTx.Code) | |||
| deliverTx := result.DeliverTx | |||
| require.Equal(abci.CodeType_OK, deliverTx.Code) | |||
| mem := node.MempoolReactor().Mempool | |||
| require.Equal(0, mem.Size()) | |||
| // TODO: find tx in block | |||
| } | |||
| //-------------------------------------------------------------------------------- | |||
| // query tx | |||
| func TestURITx(t *testing.T) { | |||
| testTx(t, GetURIClient(), true) | |||
| core.SetTxIndexer(&null.TxIndex{}) | |||
| defer core.SetTxIndexer(node.ConsensusState().GetState().TxIndexer) | |||
| testTx(t, GetURIClient(), false) | |||
| } | |||
| func TestJSONTx(t *testing.T) { | |||
| testTx(t, GetJSONClient(), true) | |||
| core.SetTxIndexer(&null.TxIndex{}) | |||
| testTx(t, GetJSONClient(), false) | |||
| core.SetTxIndexer(node.ConsensusState().GetState().TxIndexer) | |||
| } | |||
| func testTx(t *testing.T, client rpc.HTTPClient, withIndexer bool) { | |||
| assert, require := assert.New(t), require.New(t) | |||
| // first we broadcast a tx | |||
| result := new(ctypes.ResultBroadcastTxCommit) | |||
| txBytes := randBytes(t) | |||
| tx := types.Tx(txBytes) | |||
| _, err := client.Call("broadcast_tx_commit", map[string]interface{}{"tx": txBytes}, result) | |||
| require.Nil(err) | |||
| checkTx := result.CheckTx | |||
| require.Equal(abci.CodeType_OK, checkTx.Code) | |||
| deliverTx := result.DeliverTx | |||
| require.Equal(abci.CodeType_OK, deliverTx.Code) | |||
| mem := node.MempoolReactor().Mempool | |||
| require.Equal(0, mem.Size()) | |||
| txHash := tx.Hash() | |||
| txHash2 := types.Tx("a different tx").Hash() | |||
| cases := []struct { | |||
| valid bool | |||
| hash []byte | |||
| prove bool | |||
| }{ | |||
| // only valid if correct hash provided | |||
| {true, txHash, false}, | |||
| {true, txHash, true}, | |||
| {false, txHash2, false}, | |||
| {false, txHash2, true}, | |||
| {false, nil, false}, | |||
| {false, nil, true}, | |||
| } | |||
| for i, tc := range cases { | |||
| idx := fmt.Sprintf("%d", i) | |||
| // now we query for the tx. | |||
| // since there's only one tx, we know index=0. | |||
| result2 := new(ctypes.ResultTx) | |||
| query := map[string]interface{}{ | |||
| "hash": tc.hash, | |||
| "prove": tc.prove, | |||
| } | |||
| _, err = client.Call("tx", query, result2) | |||
| valid := (withIndexer && tc.valid) | |||
| if !valid { | |||
| require.NotNil(err, idx) | |||
| } else { | |||
| require.Nil(err, idx) | |||
| assert.Equal(tx, result2.Tx, idx) | |||
| assert.Equal(result.Height, result2.Height, idx) | |||
| assert.Equal(0, result2.Index, idx) | |||
| assert.Equal(abci.CodeType_OK, result2.TxResult.Code, idx) | |||
| // time to verify the proof | |||
| proof := result2.Proof | |||
| if tc.prove && assert.Equal(tx, proof.Data, idx) { | |||
| assert.True(proof.Proof.Verify(proof.Index, proof.Total, tx.Hash(), proof.RootHash), idx) | |||
| } | |||
| } | |||
| } | |||
| } | |||
| //-------------------------------------------------------------------------------- | |||
| // Test the websocket service | |||
| var wsTyp = "JSONRPC" | |||
| // make a simple connection to the server | |||
| func TestWSConnect(t *testing.T) { | |||
| wsc := GetWSClient() | |||
| wsc.Stop() | |||
| } | |||
| // receive a new block message | |||
| func TestWSNewBlock(t *testing.T) { | |||
| wsc := GetWSClient() | |||
| eid := types.EventStringNewBlock() | |||
| require.Nil(t, wsc.Subscribe(eid)) | |||
| defer func() { | |||
| require.Nil(t, wsc.Unsubscribe(eid)) | |||
| wsc.Stop() | |||
| }() | |||
| waitForEvent(t, wsc, eid, true, func() {}, func(eid string, b interface{}) error { | |||
| // fmt.Println("Check:", b) | |||
| return nil | |||
| }) | |||
| } | |||
| // receive a few new block messages in a row, with increasing height | |||
| func TestWSBlockchainGrowth(t *testing.T) { | |||
| if testing.Short() { | |||
| t.Skip("skipping test in short mode.") | |||
| } | |||
| wsc := GetWSClient() | |||
| eid := types.EventStringNewBlock() | |||
| require.Nil(t, wsc.Subscribe(eid)) | |||
| defer func() { | |||
| require.Nil(t, wsc.Unsubscribe(eid)) | |||
| wsc.Stop() | |||
| }() | |||
| // listen for NewBlock, ensure height increases by 1 | |||
| var initBlockN int | |||
| for i := 0; i < 3; i++ { | |||
| waitForEvent(t, wsc, eid, true, func() {}, func(eid string, eventData interface{}) error { | |||
| block := eventData.(types.TMEventData).Unwrap().(types.EventDataNewBlock).Block | |||
| if i == 0 { | |||
| initBlockN = block.Header.Height | |||
| } else { | |||
| if block.Header.Height != initBlockN+i { | |||
| return fmt.Errorf("Expected block %d, got block %d", initBlockN+i, block.Header.Height) | |||
| } | |||
| } | |||
| return nil | |||
| }) | |||
| } | |||
| } | |||
| func TestWSTxEvent(t *testing.T) { | |||
| require := require.New(t) | |||
| wsc := GetWSClient() | |||
| tx := randBytes(t) | |||
| // listen for the tx I am about to submit | |||
| eid := types.EventStringTx(types.Tx(tx)) | |||
| require.Nil(wsc.Subscribe(eid)) | |||
| defer func() { | |||
| require.Nil(wsc.Unsubscribe(eid)) | |||
| wsc.Stop() | |||
| }() | |||
| // send an tx | |||
| result := new(ctypes.ResultBroadcastTx) | |||
| _, err := GetJSONClient().Call("broadcast_tx_sync", map[string]interface{}{"tx": tx}, result) | |||
| require.Nil(err) | |||
| waitForEvent(t, wsc, eid, true, func() {}, func(eid string, b interface{}) error { | |||
| evt, ok := b.(types.TMEventData).Unwrap().(types.EventDataTx) | |||
| require.True(ok, "Got wrong event type: %#v", b) | |||
| require.Equal(tx, []byte(evt.Tx), "Returned different tx") | |||
| require.Equal(abci.CodeType_OK, evt.Code) | |||
| return nil | |||
| }) | |||
| } | |||
| /* TODO: this with dummy app.. | |||
| func TestWSDoubleFire(t *testing.T) { | |||
| if testing.Short() { | |||
| t.Skip("skipping test in short mode.") | |||
| } | |||
| con := newWSCon(t) | |||
| eid := types.EventStringAccInput(user[0].Address) | |||
| subscribe(t, con, eid) | |||
| defer func() { | |||
| unsubscribe(t, con, eid) | |||
| con.Close() | |||
| }() | |||
| amt := int64(100) | |||
| toAddr := user[1].Address | |||
| // broadcast the transaction, wait to hear about it | |||
| waitForEvent(t, con, eid, true, func() { | |||
| tx := makeDefaultSendTxSigned(t, wsTyp, toAddr, amt) | |||
| broadcastTx(t, wsTyp, tx) | |||
| }, func(eid string, b []byte) error { | |||
| return nil | |||
| }) | |||
| // but make sure we don't hear about it twice | |||
| waitForEvent(t, con, eid, false, func() { | |||
| }, func(eid string, b []byte) error { | |||
| return nil | |||
| }) | |||
| }*/ | |||