zolfa
/
tendermint
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 221 Wiki Activity
Browse Source

Update glide.yaml and fix tests

pull/1780/head
Jae Kwon 7 years ago
parent
ff65421324
commit
a861d68a31
9 changed files with 46 additions and 55 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      cmd/abci-cli/abci-cli.go
  2. +3
    -6
      example/dummy/dummy.go
  3. +8
    -8
      example/dummy/dummy_test.go
  4. +4
    -5
      example/dummy/persistent_dummy.go
  5. +3
    -3
      example/example_test.go
  6. +19
    -24
      glide.lock
  7. +3
    -3
      glide.yaml
  8. +2
    -2
      tests/client_server_test.go
  9. +1
    -1
      tests/test_app/app.go

+ 3
- 3
cmd/abci-cli/abci-cli.go View File

@ -79,7 +79,7 @@ var RootCmd = &cobra.Command{
return err return err
} }
client.SetLogger(logger.With("module", "abci-client")) client.SetLogger(logger.With("module", "abci-client"))
if err := client.Start(); err != nil {
if _, err := client.Start(); err != nil {
return err return err
} }
} }
@ -631,7 +631,7 @@ func cmdCounter(cmd *cobra.Command, args []string) error {
return err return err
} }
srv.SetLogger(logger.With("module", "abci-server")) srv.SetLogger(logger.With("module", "abci-server"))
if err := srv.Start(); err != nil {
if _, err := srv.Start(); err != nil {
return err return err
} }
@ -661,7 +661,7 @@ func cmdDummy(cmd *cobra.Command, args []string) error {
return err return err
} }
srv.SetLogger(logger.With("module", "abci-server")) srv.SetLogger(logger.With("module", "abci-server"))
if err := srv.Start(); err != nil {
if _, err := srv.Start(); err != nil {
return err return err
} }


+ 3
- 6
example/dummy/dummy.go View File

@ -6,7 +6,6 @@ import (
"github.com/tendermint/abci/example/code" "github.com/tendermint/abci/example/code"
"github.com/tendermint/abci/types" "github.com/tendermint/abci/types"
wire "github.com/tendermint/go-wire"
"github.com/tendermint/iavl" "github.com/tendermint/iavl"
dbm "github.com/tendermint/tmlibs/db" dbm "github.com/tendermint/tmlibs/db"
) )
@ -20,7 +19,7 @@ type DummyApplication struct {
} }
func NewDummyApplication() *DummyApplication { func NewDummyApplication() *DummyApplication {
state := iavl.NewVersionedTree(0, dbm.NewMemDB())
state := iavl.NewVersionedTree(dbm.NewMemDB(), 0)
return &DummyApplication{state: state} return &DummyApplication{state: state}
} }
@ -56,9 +55,7 @@ func (app *DummyApplication) Commit() types.ResponseCommit {
var err error var err error
if app.state.Size() > 0 { if app.state.Size() > 0 {
// just add one more to height (kind of arbitrarily stupid)
height := app.state.LatestVersion() + 1
hash, err = app.state.SaveVersion(height)
hash, _, err = app.state.SaveVersion()
if err != nil { if err != nil {
// if this wasn't a dummy app, we'd do something smarter // if this wasn't a dummy app, we'd do something smarter
panic(err) panic(err)
@ -78,7 +75,7 @@ func (app *DummyApplication) Query(reqQuery types.RequestQuery) (resQuery types.
resQuery.Index = -1 // TODO make Proof return index resQuery.Index = -1 // TODO make Proof return index
resQuery.Key = reqQuery.Data resQuery.Key = reqQuery.Data
resQuery.Value = value resQuery.Value = value
resQuery.Proof = wire.BinaryBytes(proof)
resQuery.Proof = proof.Bytes()
if value != nil { if value != nil {
resQuery.Log = "exists" resQuery.Log = "exists"
} else { } else {


+ 8
- 8
example/dummy/dummy_test.go View File

@ -41,9 +41,9 @@ func testDummy(t *testing.T, app types.Application, tx []byte, key, value string
}) })
require.EqualValues(t, code.CodeTypeOK, resQuery.Code) require.EqualValues(t, code.CodeTypeOK, resQuery.Code)
require.Equal(t, value, string(resQuery.Value)) require.Equal(t, value, string(resQuery.Value))
proof, err := iavl.ReadKeyExistsProof(resQuery.Proof)
proof, err := iavl.ReadKeyProof(resQuery.Proof)
require.Nil(t, err) require.Nil(t, err)
err = proof.Verify([]byte(key), resQuery.Value, proof.RootHash)
err = proof.Verify([]byte(key), resQuery.Value, proof.Root())
require.Nil(t, err, "%+v", err) // NOTE: we have no way to verify the RootHash require.Nil(t, err, "%+v", err) // NOTE: we have no way to verify the RootHash
} }
@ -215,14 +215,14 @@ func makeSocketClientServer(app types.Application, name string) (abcicli.Client,
server := abciserver.NewSocketServer(socket, app) server := abciserver.NewSocketServer(socket, app)
server.SetLogger(logger.With("module", "abci-server")) server.SetLogger(logger.With("module", "abci-server"))
if err := server.Start(); err != nil {
if _, err := server.Start(); err != nil {
return nil, nil, err return nil, nil, err
} }
// Connect to the socket // Connect to the socket
client := abcicli.NewSocketClient(socket, false) client := abcicli.NewSocketClient(socket, false)
client.SetLogger(logger.With("module", "abci-client")) client.SetLogger(logger.With("module", "abci-client"))
if err := client.Start(); err != nil {
if _, err := client.Start(); err != nil {
server.Stop() server.Stop()
return nil, nil, err return nil, nil, err
} }
@ -238,13 +238,13 @@ func makeGRPCClientServer(app types.Application, name string) (abcicli.Client, c
gapp := types.NewGRPCApplication(app) gapp := types.NewGRPCApplication(app)
server := abciserver.NewGRPCServer(socket, gapp) server := abciserver.NewGRPCServer(socket, gapp)
server.SetLogger(logger.With("module", "abci-server")) server.SetLogger(logger.With("module", "abci-server"))
if err := server.Start(); err != nil {
if _, err := server.Start(); err != nil {
return nil, nil, err return nil, nil, err
} }
client := abcicli.NewGRPCClient(socket, true) client := abcicli.NewGRPCClient(socket, true)
client.SetLogger(logger.With("module", "abci-client")) client.SetLogger(logger.With("module", "abci-client"))
if err := client.Start(); err != nil {
if _, err := client.Start(); err != nil {
server.Stop() server.Stop()
return nil, nil, err return nil, nil, err
} }
@ -310,8 +310,8 @@ func testClient(t *testing.T, app abcicli.Client, tx []byte, key, value string)
require.Nil(t, err) require.Nil(t, err)
require.Equal(t, code.CodeTypeOK, resQuery.Code) require.Equal(t, code.CodeTypeOK, resQuery.Code)
require.Equal(t, value, string(resQuery.Value)) require.Equal(t, value, string(resQuery.Value))
proof, err := iavl.ReadKeyExistsProof(resQuery.Proof)
proof, err := iavl.ReadKeyProof(resQuery.Proof)
require.Nil(t, err) require.Nil(t, err)
err = proof.Verify([]byte(key), resQuery.Value, proof.RootHash)
err = proof.Verify([]byte(key), resQuery.Value, proof.Root())
require.Nil(t, err, "%+v", err) // NOTE: we have no way to verify the RootHash require.Nil(t, err, "%+v", err) // NOTE: we have no way to verify the RootHash
} }

+ 4
- 5
example/dummy/persistent_dummy.go View File

@ -40,7 +40,7 @@ func NewPersistentDummyApplication(dbDir string) *PersistentDummyApplication {
panic(err) panic(err)
} }
stateTree := iavl.NewVersionedTree(500, db)
stateTree := iavl.NewVersionedTree(db, 500)
stateTree.Load() stateTree.Load()
return &PersistentDummyApplication{ return &PersistentDummyApplication{
@ -55,8 +55,7 @@ func (app *PersistentDummyApplication) SetLogger(l log.Logger) {
func (app *PersistentDummyApplication) Info(req types.RequestInfo) types.ResponseInfo { func (app *PersistentDummyApplication) Info(req types.RequestInfo) types.ResponseInfo {
res := app.app.Info(req) res := app.app.Info(req)
var latestVersion uint64 = app.app.state.LatestVersion() // TODO: change to int64
res.LastBlockHeight = int64(latestVersion)
res.LastBlockHeight = app.app.state.Version64()
res.LastBlockAppHash = app.app.state.Hash() res.LastBlockAppHash = app.app.state.Hash()
return res return res
} }
@ -87,11 +86,11 @@ func (app *PersistentDummyApplication) CheckTx(tx []byte) types.ResponseCheckTx
func (app *PersistentDummyApplication) Commit() types.ResponseCommit { func (app *PersistentDummyApplication) Commit() types.ResponseCommit {
// Save a new version for next height // Save a new version for next height
height := app.app.state.LatestVersion() + 1
var height int64
var appHash []byte var appHash []byte
var err error var err error
appHash, err = app.app.state.SaveVersion(height)
appHash, height, err = app.app.state.SaveVersion()
if err != nil { if err != nil {
// if this wasn't a dummy app, we'd do something smarter // if this wasn't a dummy app, we'd do something smarter
panic(err) panic(err)


+ 3
- 3
example/example_test.go View File

@ -42,7 +42,7 @@ func testStream(t *testing.T, app types.Application) {
// Start the listener // Start the listener
server := abciserver.NewSocketServer("unix://test.sock", app) server := abciserver.NewSocketServer("unix://test.sock", app)
server.SetLogger(log.TestingLogger().With("module", "abci-server")) server.SetLogger(log.TestingLogger().With("module", "abci-server"))
if err := server.Start(); err != nil {
if _, err := server.Start(); err != nil {
t.Fatalf("Error starting socket server: %v", err.Error()) t.Fatalf("Error starting socket server: %v", err.Error())
} }
defer server.Stop() defer server.Stop()
@ -50,7 +50,7 @@ func testStream(t *testing.T, app types.Application) {
// Connect to the socket // Connect to the socket
client := abcicli.NewSocketClient("unix://test.sock", false) client := abcicli.NewSocketClient("unix://test.sock", false)
client.SetLogger(log.TestingLogger().With("module", "abci-client")) client.SetLogger(log.TestingLogger().With("module", "abci-client"))
if err := client.Start(); err != nil {
if _, err := client.Start(); err != nil {
t.Fatalf("Error starting socket client: %v", err.Error()) t.Fatalf("Error starting socket client: %v", err.Error())
} }
defer client.Stop() defer client.Stop()
@ -115,7 +115,7 @@ func testGRPCSync(t *testing.T, app *types.GRPCApplication) {
// Start the listener // Start the listener
server := abciserver.NewGRPCServer("unix://test.sock", app) server := abciserver.NewGRPCServer("unix://test.sock", app)
server.SetLogger(log.TestingLogger().With("module", "abci-server")) server.SetLogger(log.TestingLogger().With("module", "abci-server"))
if err := server.Start(); err != nil {
if _, err := server.Start(); err != nil {
t.Fatalf("Error starting GRPC server: %v", err.Error()) t.Fatalf("Error starting GRPC server: %v", err.Error())
} }
defer server.Stop() defer server.Stop()


+ 19
- 24
glide.lock View File

@ -1,32 +1,29 @@
hash: 6cb2c869c8ce7d9e43b1e8930b9b1bc974ebb3d36d4b704fc78b77efba956a13
updated: 2017-11-30T17:08:29.176515576-05:00
hash: 2fe5021646e1cdb80999a9fe0a88a6b695409fa9891b28a97682d2782c9d26ab
updated: 2017-12-26T00:33:47.921468008-08:00
imports: imports:
- name: github.com/btcsuite/btcd - name: github.com/btcsuite/btcd
version: 2e60448ffcc6bf78332d1fe590260095f554dd78
version: c7588cbf7690cd9f047a28efa2dcd8f2435a4e5e
subpackages: subpackages:
- btcec - btcec
- name: github.com/go-kit/kit - name: github.com/go-kit/kit
version: e3b2152e0063c5f05efea89ecbe297852af2a92d
version: e2b298466b32c7cd5579a9b9b07e968fc9d9452c
subpackages: subpackages:
- log - log
- log/level - log/level
- log/term - log/term
- name: github.com/go-logfmt/logfmt - name: github.com/go-logfmt/logfmt
version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
- name: github.com/go-playground/locales
version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6
subpackages:
- currency
- name: github.com/go-playground/universal-translator
version: 71201497bace774495daed26a3874fd339e0b538
- name: github.com/go-stack/stack - name: github.com/go-stack/stack
version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc
version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf
- name: github.com/gogo/protobuf - name: github.com/gogo/protobuf
version: 342cbe0a04158f6dcb03ca0079991a51a4248c02 version: 342cbe0a04158f6dcb03ca0079991a51a4248c02
subpackages: subpackages:
- gogoproto - gogoproto
- jsonpb
- proto - proto
- protoc-gen-gogo/descriptor - protoc-gen-gogo/descriptor
- sortkeys
- types
- name: github.com/golang/protobuf - name: github.com/golang/protobuf
version: 1e59b77b52bf8e4b449a57e6f79f21226d571845 version: 1e59b77b52bf8e4b449a57e6f79f21226d571845
subpackages: subpackages:
@ -44,13 +41,13 @@ imports:
- name: github.com/kr/logfmt - name: github.com/kr/logfmt
version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
- name: github.com/pkg/errors - name: github.com/pkg/errors
version: f15c970de5b76fac0b59abb32d62c17cc7bed265
version: 645ef00459ed84a119197bfb8d8205042c6df63d
- name: github.com/spf13/cobra - name: github.com/spf13/cobra
version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
- name: github.com/spf13/pflag - name: github.com/spf13/pflag
version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea
- name: github.com/syndtr/goleveldb - name: github.com/syndtr/goleveldb
version: adf24ef3f94bd13ec4163060b21a5678f22b429b
version: b89cc31ef7977104127d34c1bd31ebd1a9db2199
subpackages: subpackages:
- leveldb - leveldb
- leveldb/cache - leveldb/cache
@ -70,22 +67,22 @@ imports:
- edwards25519 - edwards25519
- extra25519 - extra25519
- name: github.com/tendermint/go-crypto - name: github.com/tendermint/go-crypto
version: b4f04f196cd719660e43b91202cd60d9a95b1837
version: 9472476a8b5814d42b96881e28a01536acfdabb3
- name: github.com/tendermint/go-wire - name: github.com/tendermint/go-wire
version: 5ab49b4c6ad674da6b81442911cf713ef0afb544
version: 27be46e25124ddf775e23317a83647ce62a93f6b
subpackages: subpackages:
- data - data
- name: github.com/tendermint/iavl - name: github.com/tendermint/iavl
version: 595f3dcd5b6cd4a292e90757ae6d367fd7a6e653
version: 7f42f4ea5187ac0184ded22a038e77faba035606
- name: github.com/tendermint/tmlibs - name: github.com/tendermint/tmlibs
version: 21fb7819891997c96838308b4eba5a50b07ff03f
version: 6ec8c1602f22f41fc320da05c3a80acebf2c23bd
subpackages: subpackages:
- common - common
- db - db
- log - log
- process - process
- name: golang.org/x/crypto - name: golang.org/x/crypto
version: 94eea52f7b742c7cbe0b03b22f0c4c8631ece122
version: edd5e9b0879d13ee6970a50153d85b8fec9f7686
subpackages: subpackages:
- nacl/secretbox - nacl/secretbox
- openpgp/armor - openpgp/armor
@ -94,7 +91,7 @@ imports:
- ripemd160 - ripemd160
- salsa20/salsa - salsa20/salsa
- name: golang.org/x/net - name: golang.org/x/net
version: a8b9294777976932365dabb6640cf1468d95c70f
version: d866cfc389cec985d6fda2859936a575a55a3ab6
subpackages: subpackages:
- context - context
- http2 - http2
@ -111,7 +108,7 @@ imports:
- unicode/bidi - unicode/bidi
- unicode/norm - unicode/norm
- name: google.golang.org/genproto - name: google.golang.org/genproto
version: 7f0da29060c682909f650ad8ed4e515bd74fa12a
version: a8101f21cf983e773d0c1133ebc5424792003214
subpackages: subpackages:
- googleapis/rpc/status - googleapis/rpc/status
- name: google.golang.org/grpc - name: google.golang.org/grpc
@ -133,11 +130,9 @@ imports:
- status - status
- tap - tap
- transport - transport
- name: gopkg.in/go-playground/validator.v9
version: 61caf9d3038e1af346dbf5c2e16f6678e1548364
testImports: testImports:
- name: github.com/davecgh/go-spew - name: github.com/davecgh/go-spew
version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
subpackages: subpackages:
- spew - spew
- name: github.com/pmezard/go-difflib - name: github.com/pmezard/go-difflib
@ -145,7 +140,7 @@ testImports:
subpackages: subpackages:
- difflib - difflib
- name: github.com/stretchr/testify - name: github.com/stretchr/testify
version: 2aa2c176b9dab406a6970f6a55f513e8a8c8b18f
version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
subpackages: subpackages:
- assert - assert
- require - require

+ 3
- 3
glide.yaml View File

@ -7,15 +7,15 @@ import:
- package: github.com/spf13/cobra - package: github.com/spf13/cobra
version: v0.0.1 version: v0.0.1
- package: github.com/tendermint/go-crypto - package: github.com/tendermint/go-crypto
version: develop
version: sdk2
- package: github.com/tendermint/go-wire - package: github.com/tendermint/go-wire
version: develop version: develop
subpackages: subpackages:
- data - data
- package: github.com/tendermint/iavl - package: github.com/tendermint/iavl
version: develop
version: sdk2
- package: github.com/tendermint/tmlibs - package: github.com/tendermint/tmlibs
version: develop
version: sdk2
subpackages: subpackages:
- common - common
- db - db


+ 2
- 2
tests/client_server_test.go View File

@ -17,11 +17,11 @@ func TestClientServerNoAddrPrefix(t *testing.T) {
server, err := abciserver.NewServer(addr, transport, app) server, err := abciserver.NewServer(addr, transport, app)
assert.NoError(t, err, "expected no error on NewServer") assert.NoError(t, err, "expected no error on NewServer")
err = server.Start()
_, err = server.Start()
assert.NoError(t, err, "expected no error on server.Start") assert.NoError(t, err, "expected no error on server.Start")
client, err := abciclient.NewClient(addr, transport, true) client, err := abciclient.NewClient(addr, transport, true)
assert.NoError(t, err, "expected no error on NewClient") assert.NoError(t, err, "expected no error on NewClient")
err = client.Start()
_, err = client.Start()
assert.NoError(t, err, "expected no error on client.Start") assert.NoError(t, err, "expected no error on client.Start")
} }

+ 1
- 1
tests/test_app/app.go View File

@ -18,7 +18,7 @@ func startClient(abciType string) abcicli.Client {
} }
logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
client.SetLogger(logger.With("module", "abcicli")) client.SetLogger(logger.With("module", "abcicli"))
if err := client.Start(); err != nil {
if _, err := client.Start(); err != nil {
panicf("connecting to abci_app: %v", err.Error()) panicf("connecting to abci_app: %v", err.Error())
} }


Write Preview
Loading…
Cancel
Save