Browse Source
abci: remove counter app (#6684)
* remove counter app * remove unneeeded ci * lint fix * modify tx sizes * cleanup docs * Update abci/cmd/abci-cli/abci-cli.go Co-authored-by: Callum Waters <cmwaters19@gmail.com> * Update docs/app-dev/getting-started.md Co-authored-by: Callum Waters <cmwaters19@gmail.com> * Update docs/app-dev/getting-started.md Co-authored-by: Callum Waters <cmwaters19@gmail.com> * bring back comment * migrate to kvstore and not persistent * remove unused func * test persistent Co-authored-by: Callum Waters <cmwaters19@gmail.com>pull/6696/head
Marko
3 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 35 additions and 664 deletions
Unified View
Diff Options
-
+0 -32.github/workflows/tests.yml
-
+1 -0CHANGELOG_PENDING.md
-
+1 -47abci/cmd/abci-cli/abci-cli.go
-
+0 -86abci/example/counter/counter.go
-
+0 -55abci/tests/test_app/app.go
-
+0 -93abci/tests/test_app/main.go
-
+0 -28abci/tests/test_app/test.sh
-
+0 -1abci/tests/test_cli/test.sh
-
+1 -3cmd/tendermint/commands/run_node.go
-
+1 -130docs/app-dev/abci-cli.md
-
+2 -88docs/app-dev/getting-started.md
-
+1 -1internal/consensus/byzantine_test.go
-
+5 -6internal/consensus/common_test.go
-
+3 -1internal/consensus/invalid_test.go
-
+8 -4internal/consensus/reactor_test.go
-
+4 -4internal/consensus/state_test.go
-
+7 -8internal/mempool/v0/clist_mempool_test.go
-
+1 -6proxy/client.go
-
+0 -2test/README.md
-
+0 -69test/app/test.sh
+ 0
- 32
.github/workflows/tests.yml
View File
+ 1
- 0
CHANGELOG_PENDING.md
View File
+ 1
- 47
abci/cmd/abci-cli/abci-cli.go
View File
+ 0
- 86
abci/example/counter/counter.go
View File
| @ -1,86 +0,0 @@ | |||||
| package counter | |||||
| import ( | |||||
| "encoding/binary" | |||||
| "fmt" | |||||
| "github.com/tendermint/tendermint/abci/example/code" | |||||
| "github.com/tendermint/tendermint/abci/types" | |||||
| ) | |||||
| type Application struct { | |||||
| types.BaseApplication | |||||
| hashCount int | |||||
| txCount int | |||||
| serial bool | |||||
| } | |||||
| func NewApplication(serial bool) *Application { | |||||
| return &Application{serial: serial} | |||||
| } | |||||
| func (app *Application) Info(req types.RequestInfo) types.ResponseInfo { | |||||
| return types.ResponseInfo{Data: fmt.Sprintf("{\"hashes\":%v,\"txs\":%v}", app.hashCount, app.txCount)} | |||||
| } | |||||
| func (app *Application) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx { | |||||
| if app.serial { | |||||
| if len(req.Tx) > 8 { | |||||
| return types.ResponseDeliverTx{ | |||||
| Code: code.CodeTypeEncodingError, | |||||
| Log: fmt.Sprintf("Max tx size is 8 bytes, got %d", len(req.Tx))} | |||||
| } | |||||
| tx8 := make([]byte, 8) | |||||
| copy(tx8[len(tx8)-len(req.Tx):], req.Tx) | |||||
| txValue := binary.BigEndian.Uint64(tx8) | |||||
| if txValue != uint64(app.txCount) { | |||||
| return types.ResponseDeliverTx{ | |||||
| Code: code.CodeTypeBadNonce, | |||||
| Log: fmt.Sprintf("Invalid nonce. Expected %v, got %v", app.txCount, txValue)} | |||||
| } | |||||
| } | |||||
| app.txCount++ | |||||
| return types.ResponseDeliverTx{Code: code.CodeTypeOK} | |||||
| } | |||||
| func (app *Application) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx { | |||||
| if app.serial { | |||||
| if len(req.Tx) > 8 { | |||||
| return types.ResponseCheckTx{ | |||||
| Code: code.CodeTypeEncodingError, | |||||
| Log: fmt.Sprintf("Max tx size is 8 bytes, got %d", len(req.Tx))} | |||||
| } | |||||
| tx8 := make([]byte, 8) | |||||
| copy(tx8[len(tx8)-len(req.Tx):], req.Tx) | |||||
| txValue := binary.BigEndian.Uint64(tx8) | |||||
| if txValue < uint64(app.txCount) { | |||||
| return types.ResponseCheckTx{ | |||||
| Code: code.CodeTypeBadNonce, | |||||
| Log: fmt.Sprintf("Invalid nonce. Expected >= %v, got %v", app.txCount, txValue)} | |||||
| } | |||||
| } | |||||
| return types.ResponseCheckTx{Code: code.CodeTypeOK} | |||||
| } | |||||
| func (app *Application) Commit() (resp types.ResponseCommit) { | |||||
| app.hashCount++ | |||||
| if app.txCount == 0 { | |||||
| return types.ResponseCommit{} | |||||
| } | |||||
| hash := make([]byte, 8) | |||||
| binary.BigEndian.PutUint64(hash, uint64(app.txCount)) | |||||
| return types.ResponseCommit{Data: hash} | |||||
| } | |||||
| func (app *Application) Query(reqQuery types.RequestQuery) types.ResponseQuery { | |||||
| switch reqQuery.Path { | |||||
| case "hash": | |||||
| return types.ResponseQuery{Value: []byte(fmt.Sprintf("%v", app.hashCount))} | |||||
| case "tx": | |||||
| return types.ResponseQuery{Value: []byte(fmt.Sprintf("%v", app.txCount))} | |||||
| default: | |||||
| return types.ResponseQuery{Log: fmt.Sprintf("Invalid query path. Expected hash or tx, got %v", reqQuery.Path)} | |||||
| } | |||||
| } | |||||
+ 0
- 55
abci/tests/test_app/app.go
View File
| @ -1,55 +0,0 @@ | |||||
| package main | |||||
| import ( | |||||
| "bytes" | |||||
| "context" | |||||
| "fmt" | |||||
| abcicli "github.com/tendermint/tendermint/abci/client" | |||||
| "github.com/tendermint/tendermint/abci/types" | |||||
| "github.com/tendermint/tendermint/libs/log" | |||||
| ) | |||||
| var ctx = context.Background() | |||||
| func startClient(abciType string) abcicli.Client { | |||||
| // Start client | |||||
| client, err := abcicli.NewClient("tcp://127.0.0.1:26658", abciType, true) | |||||
| if err != nil { | |||||
| panic(err.Error()) | |||||
| } | |||||
| logger := log.MustNewDefaultLogger(log.LogFormatPlain, log.LogLevelInfo, false) | |||||
| client.SetLogger(logger.With("module", "abcicli")) | |||||
| if err := client.Start(); err != nil { | |||||
| panicf("connecting to abci_app: %v", err.Error()) | |||||
| } | |||||
| return client | |||||
| } | |||||
| func commit(client abcicli.Client, hashExp []byte) { | |||||
| res, err := client.CommitSync(ctx) | |||||
| if err != nil { | |||||
| panicf("client error: %v", err) | |||||
| } | |||||
| if !bytes.Equal(res.Data, hashExp) { | |||||
| panicf("Commit hash was unexpected. Got %X expected %X", res.Data, hashExp) | |||||
| } | |||||
| } | |||||
| func deliverTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp []byte) { | |||||
| res, err := client.DeliverTxSync(ctx, types.RequestDeliverTx{Tx: txBytes}) | |||||
| if err != nil { | |||||
| panicf("client error: %v", err) | |||||
| } | |||||
| if res.Code != codeExp { | |||||
| panicf("DeliverTx response code was unexpected. Got %v expected %v. Log: %v", res.Code, codeExp, res.Log) | |||||
| } | |||||
| if !bytes.Equal(res.Data, dataExp) { | |||||
| panicf("DeliverTx response data was unexpected. Got %X expected %X", res.Data, dataExp) | |||||
| } | |||||
| } | |||||
| func panicf(format string, a ...interface{}) { | |||||
| panic(fmt.Sprintf(format, a...)) | |||||
| } | |||||
+ 0
- 93
abci/tests/test_app/main.go
View File
| @ -1,93 +0,0 @@ | |||||
| package main | |||||
| import ( | |||||
| "fmt" | |||||
| "log" | |||||
| "os" | |||||
| "os/exec" | |||||
| "time" | |||||
| "github.com/tendermint/tendermint/abci/types" | |||||
| ) | |||||
| var abciType string | |||||
| func init() { | |||||
| abciType = os.Getenv("ABCI") | |||||
| if abciType == "" { | |||||
| abciType = "socket" | |||||
| } | |||||
| } | |||||
| func main() { | |||||
| testCounter() | |||||
| } | |||||
| const ( | |||||
| maxABCIConnectTries = 10 | |||||
| ) | |||||
| func ensureABCIIsUp(typ string, n int) error { | |||||
| var err error | |||||
| cmdString := "abci-cli echo hello" | |||||
| if typ == "grpc" { | |||||
| cmdString = "abci-cli --abci grpc echo hello" | |||||
| } | |||||
| for i := 0; i < n; i++ { | |||||
| cmd := exec.Command("bash", "-c", cmdString) | |||||
| _, err = cmd.CombinedOutput() | |||||
| if err == nil { | |||||
| break | |||||
| } | |||||
| time.Sleep(500 * time.Millisecond) | |||||
| } | |||||
| return err | |||||
| } | |||||
| func testCounter() { | |||||
| abciApp := os.Getenv("ABCI_APP") | |||||
| if abciApp == "" { | |||||
| panic("No ABCI_APP specified") | |||||
| } | |||||
| fmt.Printf("Running %s test with abci=%s\n", abciApp, abciType) | |||||
| subCommand := fmt.Sprintf("abci-cli %s", abciApp) | |||||
| cmd := exec.Command("bash", "-c", subCommand) | |||||
| cmd.Stdout = os.Stdout | |||||
| if err := cmd.Start(); err != nil { | |||||
| log.Fatalf("starting %q err: %v", abciApp, err) | |||||
| } | |||||
| defer func() { | |||||
| if err := cmd.Process.Kill(); err != nil { | |||||
| log.Printf("error on process kill: %v", err) | |||||
| } | |||||
| if err := cmd.Wait(); err != nil { | |||||
| log.Printf("error while waiting for cmd to exit: %v", err) | |||||
| } | |||||
| }() | |||||
| if err := ensureABCIIsUp(abciType, maxABCIConnectTries); err != nil { | |||||
| log.Fatalf("echo failed: %v", err) //nolint:gocritic | |||||
| } | |||||
| client := startClient(abciType) | |||||
| defer func() { | |||||
| if err := client.Stop(); err != nil { | |||||
| log.Printf("error trying client stop: %v", err) | |||||
| } | |||||
| }() | |||||
| // commit(client, nil) | |||||
| // deliverTx(client, []byte("abc"), code.CodeTypeBadNonce, nil) | |||||
| commit(client, nil) | |||||
| deliverTx(client, []byte{0x00}, types.CodeTypeOK, nil) | |||||
| commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 1}) | |||||
| // deliverTx(client, []byte{0x00}, code.CodeTypeBadNonce, nil) | |||||
| deliverTx(client, []byte{0x01}, types.CodeTypeOK, nil) | |||||
| deliverTx(client, []byte{0x00, 0x02}, types.CodeTypeOK, nil) | |||||
| deliverTx(client, []byte{0x00, 0x03}, types.CodeTypeOK, nil) | |||||
| deliverTx(client, []byte{0x00, 0x00, 0x04}, types.CodeTypeOK, nil) | |||||
| // deliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil) | |||||
| commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5}) | |||||
| } | |||||
+ 0
- 28
abci/tests/test_app/test.sh
View File
| @ -1,28 +0,0 @@ | |||||
| #! /bin/bash | |||||
| set -e | |||||
| # These tests spawn the counter app and server by execing the ABCI_APP command and run some simple client tests against it | |||||
| # Get the directory of where this script is. | |||||
| export PATH="$GOBIN:$PATH" | |||||
| SOURCE="${BASH_SOURCE[0]}" | |||||
| while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done | |||||
| DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" | |||||
| # Change into that dir because we expect that. | |||||
| cd "$DIR" | |||||
| echo "RUN COUNTER OVER SOCKET" | |||||
| # test golang counter | |||||
| ABCI_APP="counter" go run -mod=readonly ./*.go | |||||
| echo "----------------------" | |||||
| echo "RUN COUNTER OVER GRPC" | |||||
| # test golang counter via grpc | |||||
| ABCI_APP="counter --abci=grpc" ABCI="grpc" go run -mod=readonly ./*.go | |||||
| echo "----------------------" | |||||
| # test nodejs counter | |||||
| # TODO: fix node app | |||||
| #ABCI_APP="node $GOPATH/src/github.com/tendermint/js-abci/example/app.js" go test -test.run TestCounter | |||||