fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-13 21:31:23 +00:00
Code Issues Projects Releases Wiki Activity

update glide

Browse Source
This commit is contained in:
Ethan Buchman
2017-02-13 21:07:26 -05:00
parent e972b942e6
commit 7d91d4300b
3 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
consensus/mempool_test.go
View File

@ -114,6 +114,8 @@ func TestRmBadTx(t *testing.T) {
// CounterApplication that maintains a mempool state and resets it upon commit // CounterApplication that maintains a mempool state and resets it upon commit
type CounterApplication struct { type CounterApplication struct {
abci.BaseApplication
txCount int txCount int
mempoolTxCount int mempoolTxCount int
} }
@ -126,10 +128,6 @@ func (app *CounterApplication) Info() abci.ResponseInfo {
return abci.ResponseInfo{Data: Fmt("txs:%v", app.txCount)} return abci.ResponseInfo{Data: Fmt("txs:%v", app.txCount)}
} }
func (app *CounterApplication) SetOption(key string, value string) (log string) {
return ""
}
func (app *CounterApplication) DeliverTx(tx []byte) abci.Result { func (app *CounterApplication) DeliverTx(tx []byte) abci.Result {
return runTx(tx, &app.txCount) return runTx(tx, &app.txCount)
} }
@ -160,8 +158,3 @@ func (app *CounterApplication) Commit() abci.Result {
return abci.NewResultOK(hash, "") return abci.NewResultOK(hash, "")
} }
} }
func (app *CounterApplication) Query(reqQuery abci.RequestQuery) (resQuery abci.ResponseQuery) {
resQuery.Log = "Query is not supported"
return
}

40
glide.lock generated
View File

@ -1,12 +1,10 @@
hash: e283934fbbd221161d53a918db9e49db8c5be2b8929592b05ffe6b72c2ef0ab1 hash: e283934fbbd221161d53a918db9e49db8c5be2b8929592b05ffe6b72c2ef0ab1
updated: 2017-01-27T22:32:42.896956819-08:00 updated: 2017-02-13T20:54:31.541721996-05:00
imports: imports:
- name: github.com/btcsuite/btcd - name: github.com/btcsuite/btcd
version: afec1bd1245a4a19e6dfe1306974b733e7cbb9b8 version: d06c0bb181529331be8f8d9350288c420d9e60e4
subpackages: subpackages:
- btcec - btcec
- name: github.com/btcsuite/fastsha256
version: 637e656429416087660c84436a2a035d69d54e2e
- name: github.com/BurntSushi/toml - name: github.com/BurntSushi/toml
version: 99064174e013895bbd9b025c31100bd1d9b590ca version: 99064174e013895bbd9b025c31100bd1d9b590ca
- name: github.com/ebuchman/fail-test - name: github.com/ebuchman/fail-test
@ -14,27 +12,27 @@ imports:
- name: github.com/go-stack/stack - name: github.com/go-stack/stack
version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82 version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82
- name: github.com/gogo/protobuf - name: github.com/gogo/protobuf
version: f9114dace7bd920b32f943b3c73fafbcbab2bf31 version: 9c5b7bafbfccf2b40d274e0496f3a09418a87af4
subpackages: subpackages:
- proto - proto
- name: github.com/golang/protobuf - name: github.com/golang/protobuf
version: 1f49d83d9aa00e6ce4fc8258c71cc7786aec968a version: 8ee79997227bf9b34611aee7946ae64735e6fd93
subpackages: subpackages:
- proto - proto
- name: github.com/golang/snappy - name: github.com/golang/snappy
version: d9eb7a3d35ec988b8585d4a0068e462c27d28380 version: 7db9049039a047d955fe8c19b83c8ff5abd765c7
- name: github.com/gorilla/websocket - name: github.com/gorilla/websocket
version: 3ab3a8b8831546bd18fd182c20687ca853b2bb13 version: 9bc973af0682dc73a22553a08bfe00ee6255f56f
- name: github.com/jmhodges/levigo - name: github.com/jmhodges/levigo
version: c42d9e0ca023e2198120196f842701bb4c55d7b9 version: c42d9e0ca023e2198120196f842701bb4c55d7b9
- name: github.com/mattn/go-colorable - name: github.com/mattn/go-colorable
version: ed8eb9e318d7a84ce5915b495b7d35e0cfe7b5a8 version: 5411d3eea5978e6cdc258b30de592b60df6aba96
- name: github.com/mattn/go-isatty - name: github.com/mattn/go-isatty
version: 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8 version: 281032e84ae07510239465db46bf442aa44b953a
- name: github.com/spf13/pflag - name: github.com/spf13/pflag
version: 5ccb023bc27df288a957c5e994cd44fd19619465 version: 9ff6c6923cfffbcd502984b8e0c80539a94968b7
- name: github.com/syndtr/goleveldb - name: github.com/syndtr/goleveldb
version: 6ae1797c0b42b9323fc27ff7dcf568df88f2f33d version: 23851d93a2292dcc56e71a18ec9e0624d84a0f65
subpackages: subpackages:
- leveldb - leveldb
- leveldb/cache - leveldb/cache
@ -49,12 +47,11 @@ imports:
- leveldb/table - leveldb/table
- leveldb/util - leveldb/util
- name: github.com/tendermint/abci - name: github.com/tendermint/abci
version: 8df0bc3a40ccad0d2be10e33c62c404e65c92502 version: 2a3f6384950041b098d89e66b93c580ecd6d32ef
subpackages: subpackages:
- client - client
- example/counter - example/counter
- example/dummy - example/dummy
- example/nil
- server - server
- types - types
- name: github.com/tendermint/ed25519 - name: github.com/tendermint/ed25519
@ -85,7 +82,7 @@ imports:
- name: github.com/tendermint/go-logger - name: github.com/tendermint/go-logger
version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2 version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
- name: github.com/tendermint/go-merkle - name: github.com/tendermint/go-merkle
version: 653cb1f631528351ddbc359b994eb0c96f0341cd version: 9f20e80cb188d07860caa70196dd7700659ec4a4
- name: github.com/tendermint/go-p2p - name: github.com/tendermint/go-p2p
version: 67c9086b7458eb45b1970483decd01cd744c477a version: 67c9086b7458eb45b1970483decd01cd744c477a
subpackages: subpackages:
@ -97,13 +94,13 @@ imports:
- server - server
- types - types
- name: github.com/tendermint/go-wire - name: github.com/tendermint/go-wire
version: 2f3b7aafe21c80b19b6ee3210ecb3e3d07c7a471 version: 3216ec9d47bbdf8d4fc27d22169ea86a6688bc15
- name: github.com/tendermint/log15 - name: github.com/tendermint/log15
version: 9545b249b3aacafa97f79e0838b02b274adc6f5f version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6
subpackages: subpackages:
- term - term
- name: golang.org/x/crypto - name: golang.org/x/crypto
version: aa2481cbfe81d911eb62b642b7a6b5ec58bbea71 version: 453249f01cfeb54c3d549ddb75ff152ca243f9d8
subpackages: subpackages:
- curve25519 - curve25519
- nacl/box - nacl/box
@ -114,20 +111,21 @@ imports:
- ripemd160 - ripemd160
- salsa20/salsa - salsa20/salsa
- name: golang.org/x/net - name: golang.org/x/net
version: cfe3c2a7525b50c3d707256e371c90938cfef98a version: 61557ac0112b576429a0df080e1c2cef5dfbb642
subpackages: subpackages:
- context - context
- http2 - http2
- http2/hpack - http2/hpack
- idna
- internal/timeseries - internal/timeseries
- lex/httplex - lex/httplex
- trace - trace
- name: golang.org/x/sys - name: golang.org/x/sys
version: 30de6d19a3bd89a5f38ae4028e23aaa5582648af version: e24f485414aeafb646f6fca458b0bf869c0880a1
subpackages: subpackages:
- unix - unix
- name: google.golang.org/grpc - name: google.golang.org/grpc
version: 50955793b0183f9de69bd78e2ec251cf20aab121 version: 4acc9108c18937815db3306a66990869d22aa980
subpackages: subpackages:
- codes - codes
- credentials - credentials

5
proxy/client.go
View File

@ -4,11 +4,10 @@ import (
"fmt" "fmt"
"sync" "sync"
cfg "github.com/tendermint/go-config"
abcicli "github.com/tendermint/abci/client" abcicli "github.com/tendermint/abci/client"
"github.com/tendermint/abci/example/dummy" "github.com/tendermint/abci/example/dummy"
nilapp "github.com/tendermint/abci/example/nil"
"github.com/tendermint/abci/types" "github.com/tendermint/abci/types"
cfg "github.com/tendermint/go-config"
) )
// NewABCIClient returns newly connected client // NewABCIClient returns newly connected client
@ -74,7 +73,7 @@ func DefaultClientCreator(config cfg.Config) ClientCreator {
case "persistent_dummy": case "persistent_dummy":
return NewLocalClientCreator(dummy.NewPersistentDummyApplication(config.GetString("db_dir"))) return NewLocalClientCreator(dummy.NewPersistentDummyApplication(config.GetString("db_dir")))
case "nilapp": case "nilapp":
return NewLocalClientCreator(nilapp.NewNilApplication()) return NewLocalClientCreator(types.NewBaseApplication())
default: default:
mustConnect := false // loop retrying mustConnect := false // loop retrying
return NewRemoteClientCreator(addr, transport, mustConnect) return NewRemoteClientCreator(addr, transport, mustConnect)