certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tmsp/example import paths

This commit is contained in:
Jae Kwon 2016-02-14 15:03:55 -08:00
parent a6d37a49a2
commit d17d4fa106
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
consensus/common_test.go
View File

@ -17,7 +17,7 @@ import (
sm "github.com/tendermint/tendermint/state" sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/types"
"github.com/tendermint/tmsp/example/golang" "github.com/tendermint/tmsp/example/counter"
) )
var chainID string var chainID string
@ -311,7 +311,7 @@ func newConsensusState(state *sm.State, pv *types.PrivValidator) *ConsensusState
blockStore := bc.NewBlockStore(blockDB) blockStore := bc.NewBlockStore(blockDB)
// one for mempool, one for consensus // one for mempool, one for consensus
mtx, app := new(sync.Mutex), example.NewCounterApplication(false) mtx, app := new(sync.Mutex), counter.NewCounterApplication(false)
proxyAppConnMem := proxy.NewLocalAppConn(mtx, app) proxyAppConnMem := proxy.NewLocalAppConn(mtx, app)
proxyAppConnCon := proxy.NewLocalAppConn(mtx, app) proxyAppConnCon := proxy.NewLocalAppConn(mtx, app)

4
mempool/mempool_test.go
View File

@ -7,13 +7,13 @@ import (
"github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/proxy"
"github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/types"
"github.com/tendermint/tmsp/example/golang" "github.com/tendermint/tmsp/example/counter"
tmsp "github.com/tendermint/tmsp/types" tmsp "github.com/tendermint/tmsp/types"
) )
func TestSerialReap(t *testing.T) { func TestSerialReap(t *testing.T) {
app := example.NewCounterApplication(true) app := counter.NewCounterApplication(true)
app.SetOption("serial", "on") app.SetOption("serial", "on")
mtx := new(sync.Mutex) mtx := new(sync.Mutex)
appConnMem := proxy.NewLocalAppConn(mtx, app) appConnMem := proxy.NewLocalAppConn(mtx, app)

4
node/node.go
View File

@ -25,7 +25,7 @@ import (
sm "github.com/tendermint/tendermint/state" sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint/version" "github.com/tendermint/tendermint/version"
"github.com/tendermint/tmsp/example/golang" "github.com/tendermint/tmsp/example/dummy"
) )
import _ "net/http/pprof" import _ "net/http/pprof"
@ -230,7 +230,7 @@ func makeNodeInfo(sw *p2p.Switch, privKey crypto.PrivKeyEd25519) *p2p.NodeInfo {
func getProxyApp(addr string, hash []byte) (proxyAppConn proxy.AppConn) { func getProxyApp(addr string, hash []byte) (proxyAppConn proxy.AppConn) {
// use local app (for testing) // use local app (for testing)
if addr == "local" { if addr == "local" {
app := example.NewDummyApplication() app := dummy.NewDummyApplication()
mtx := new(sync.Mutex) mtx := new(sync.Mutex)
proxyAppConn = proxy.NewLocalAppConn(mtx, app) proxyAppConn = proxy.NewLocalAppConn(mtx, app)
} else { } else {

8
proxy/remote_app_conn_test.go
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
. "github.com/tendermint/go-common" . "github.com/tendermint/go-common"
"github.com/tendermint/tmsp/example/golang" "github.com/tendermint/tmsp/example/dummy"
"github.com/tendermint/tmsp/server" "github.com/tendermint/tmsp/server"
) )
@ -13,7 +13,7 @@ func TestEcho(t *testing.T) {
sockPath := Fmt("unix:///tmp/echo_%v.sock", RandStr(6)) sockPath := Fmt("unix:///tmp/echo_%v.sock", RandStr(6))
// Start server // Start server
_, err := server.StartListener(sockPath, example.NewDummyApplication()) _, err := server.StartListener(sockPath, dummy.NewDummyApplication())
if err != nil { if err != nil {
Exit(err.Error()) Exit(err.Error())
} }
@ -35,7 +35,7 @@ func BenchmarkEcho(b *testing.B) {
b.StopTimer() // Initialize b.StopTimer() // Initialize
sockPath := Fmt("unix:///tmp/echo_%v.sock", RandStr(6)) sockPath := Fmt("unix:///tmp/echo_%v.sock", RandStr(6))
// Start server // Start server
_, err := server.StartListener(sockPath, example.NewDummyApplication()) _, err := server.StartListener(sockPath, dummy.NewDummyApplication())
if err != nil { if err != nil {
Exit(err.Error()) Exit(err.Error())
} }
@ -62,7 +62,7 @@ func BenchmarkEcho(b *testing.B) {
func TestInfo(t *testing.T) { func TestInfo(t *testing.T) {
sockPath := Fmt("unix:///tmp/echo_%v.sock", RandStr(6)) sockPath := Fmt("unix:///tmp/echo_%v.sock", RandStr(6))
// Start server // Start server
_, err := server.StartListener(sockPath, example.NewDummyApplication()) _, err := server.StartListener(sockPath, dummy.NewDummyApplication())
if err != nil { if err != nil {
Exit(err.Error()) Exit(err.Error())
} }