Integration Test Suite against testnet

packages/go-kosu/abci/app.go

@@ -71,7 +71,7 @@ func (app *App) NewClient() (*Client, error) {
 		return nil, err
 	}
 
-	return NewHTTPClient(url, key), nil
+	return NewHTTPClient(url, key)
 }
 
 // Query queries the application state using the store.Query method
@@ -301,5 +301,5 @@ func (app *App) DeliverTx(req []byte) abci.ResponseDeliverTx {
 		fmt.Printf("Unknown Tx: %t", tx.GetData())
 	}
 
-	return abci.ResponseDeliverTx{Code: 1, Info: "Unknown Transaction type"}
+	return abci.ResponseDeliverTx{Code: 1, Log: "Unknown Transaction type"}
 }

packages/go-kosu/abci/client.go

@@ -32,9 +32,13 @@ func NewClient(c client.Client, key []byte) *Client {
 }
 
 // NewHTTPClient calls NewClient using a HTTPClient as ABCClient
-func NewHTTPClient(addr string, key []byte) *Client {
+func NewHTTPClient(addr string, key []byte) (*Client, error) {
 	c := client.NewHTTP(addr, "/websocket")
-	return NewClient(c, key)
+	if err := c.Start(); err != nil {
+		return nil, err
+	}
+
+	return NewClient(c, key), nil
 }
 
 // BroadcastTxAsync will return right away without waiting to hear if the transaction is even valid
@@ -90,24 +94,13 @@ func (c *Client) Subscribe(ctx context.Context, q string) (<-chan rpctypes.Resul
 		return nil, nil, err
 	}
 
-	// Start WS if not yet
-	if httpC, ok := c.Client.(*client.HTTP); ok {
-		if !httpC.IsRunning() {
-			if err := httpC.Start(); err != nil {
-				return nil, nil, err
-			}
-		}
-	}
-
 	ch, err := c.Client.Subscribe(ctx, "kosu", q)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	closer := func() {
-		if httpC, ok := c.Client.(*client.HTTP); ok {
-			_ = httpC.Stop()
-		}
+		_ = c.Client.Unsubscribe(ctx, "kosu", q)
 	}
 
 	return ch, closer, nil
@@ -138,6 +131,27 @@ func (c *Client) QueryConsensusParams() (*types.ConsensusParams, error) {
 	return &pb, nil
 }
 
+// QueryLastEvent performs a ABCI Query to "/lastevent".
+// `lastevent` keeps track of the last block height recorded from the Ethereum chain
+func (c *Client) QueryLastEvent() (uint64, error) {
+	out, err := c.ABCIQuery("/chain/key", []byte("lastevent"))
+	if err != nil {
+		return 0, err
+	}
+	res := out.Response
+
+	if res.IsErr() {
+		return 0, errors.New(res.GetLog())
+	}
+
+	if len(res.Value) == 0 {
+		return 0, nil
+	}
+
+	buf := proto.NewBuffer(res.Value)
+	return buf.DecodeFixed64()
+}
+
 // QueryPoster performs a ABCI Query to "/posters/<addr>"
 func (c *Client) QueryPoster(addr string) (*types.Poster, error) {
 	var pb types.Poster

packages/go-kosu/abci/witness.go

@@ -33,8 +33,8 @@ func (app *App) deliverWitnessTx(tx *types.TransactionWitness, nodeID []byte) ab
 }
 
 func (app *App) pruneWitnessTxs(block uint64) {
+	params := app.store.ConsensusParams()
 	fn := func(tx *types.TransactionWitness) {
-		params := app.store.ConsensusParams()
 		if block-tx.Block >= params.BlocksBeforePruning {
 			app.log.Debug("Pruning tx", "id", hex.EncodeToString(tx.Id))
 			app.store.DeleteWitnessTx(tx.Id)

packages/go-kosu/cmd/kosu-cli/main.go

@@ -15,7 +15,7 @@ import (
 )
 
 func main() {
-	var client abci.Client
+	var client *abci.Client
 
 	rootCmd := &cobra.Command{
 		Use:   "kosu-cli",
@@ -45,11 +45,11 @@ func main() {
 		addr := cmd.Flag("abci").Value.String()
 
 		// update the client
-		client = *abci.NewHTTPClient(addr, key)
-		return nil
+		client, err = abci.NewHTTPClient(addr, key)
+		return err
 	}
 
-	abci := cli.New(&client)
+	abci := cli.New(client)
 
 	tx := &cobra.Command{
 		Use:   "tx",

packages/go-kosu/cmd/kosud/main.go

@@ -42,9 +42,12 @@ func newDB(dir string, debug bool) (db.DB, error) {
 }
 
 func startWitness(ctx context.Context, ethAddr string, nodeAddr string, key []byte, logger log.Logger) error {
-	client := abci.NewHTTPClient(nodeAddr, key)
-	p, err := witness.NewEthereumProvider(ethAddr)
+	client, err := abci.NewHTTPClient(nodeAddr, key)
+	if err != nil {
+		return nil
+	}
 
+	p, err := witness.NewEthereumProvider(ethAddr)
 	if err != nil {
 		return err
 	}

packages/go-kosu/rpc/cmd.go

@@ -49,8 +49,11 @@ func NewCommand() *cobra.Command {
 
 			return nil
 		},
-		Run: func(cmd *cobra.Command, args []string) {
-			client := abci.NewHTTPClient(url, key)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			client, err := abci.NewHTTPClient(url, key)
+			if err != nil {
+				return err
+			}
 			srv := NewServer(client)
 
 			wg := sync.WaitGroup{}
@@ -74,6 +77,7 @@ func NewCommand() *cobra.Command {
 				}()
 			}
 			wg.Wait()
+			return nil
 		},
 	}
 

packages/go-kosu/rpc/rpc_test.go

@@ -28,13 +28,8 @@ func newServerClient(t *testing.T) (*abci.App, *rpc.Client, func()) {
 }
 
 func TestRPCLatestHeight(t *testing.T) {
-	_, closer := tests.StartServer(t, db.NewMemDB())
+	_, client, closer := newServerClient(t)
 	defer closer()
-	client := rpc.DialInProc(
-		NewServer(
-			abci.NewHTTPClient("http://localhost:26657", nil),
-		),
-	)
 
 	var latest uint64
 	// Get the initial (prior the first block is mined)

packages/go-kosu/testnet/node0/config/config.toml

@@ -22,7 +22,7 @@ db_backend = "leveldb"
 db_dir = "data"
 
 # Output level for logging, including package level options
-log_level = "app:info,*:error"
+log_level = "app:debug,*:error"
 
 # Output format: 'plain' (colored text) or 'json'
 log_format = "plain"

packages/go-kosu/testnet/node0/config/genesis.json

@@ -43,7 +43,8 @@
     "app_state": {
         "ConsensusParams": {
             "PeriodLimit": 100000,
-            "PeriodLength": 10
+            "PeriodLength": 10,
+            "BlocksBeforePruning": 10
         }
     }
 }

packages/go-kosu/testnet/node1/config/genesis.json

@@ -43,7 +43,8 @@
     "app_state": {
         "ConsensusParams": {
             "PeriodLimit": 100000,
-            "PeriodLength": 10
+            "PeriodLength": 10,
+            "BlocksBeforePruning": 10
         }
     }
 }

packages/go-kosu/testnet/node2/config/genesis.json

@@ -43,7 +43,8 @@
     "app_state": {
         "ConsensusParams": {
             "PeriodLimit": 100000,
-            "PeriodLength": 10
+            "PeriodLength": 10,
+            "BlocksBeforePruning": 10
         }
     }
 }

packages/go-kosu/testnet/node3/config/genesis.json

@@ -43,7 +43,8 @@
     "app_state": {
         "ConsensusParams": {
             "PeriodLimit": 100000,
-            "PeriodLength": 10
+            "PeriodLength": 10,
+            "BlocksBeforePruning": 10
         }
     }
 }

packages/go-kosu/tests/helpers.go

@@ -0,0 +1,25 @@
+package tests
+
+import (
+	"math/rand"
+	"os"
+	"testing"
+)
+
+func envOrSkip(t *testing.T, env string) string {
+	v := os.Getenv(env)
+	if v == "" {
+		t.Skipf("Integration test suite requires '%s' to be exported", env)
+	}
+	return v
+}
+
+func randomHex(size int) string {
+	var alphabet = []rune("abcdefABCDEF0123456789")
+
+	b := make([]rune, size)
+	for i := range b {
+		b[i] = alphabet[rand.Intn(len(alphabet))]
+	}
+	return string(b)
+}