Merge pull request #818 from HaoyangLiu/develop

R4R: Move client/lcd to lite

.gitignore

@@ -7,8 +7,6 @@ docs/.vuepress/dist/
 node_modules/
 package.json
 yarn.lock
-client/lcd/statik/statik.go
+lite/statik/statik.go
 dependency-graph.png
-tools/protobuf/*.a
-tools/protobuf/*.o
-tools/protobuf/*.so
+

Makefile

@@ -74,7 +74,7 @@ draw_deps:
 ########################################
 ### Generate swagger docs for irislcd
 update_irislcd_swagger_docs:
-	@statik -src=client/lcd/swaggerui -dest=client/lcd -f
+	@statik -src=lite/swagger-ui -dest=lite -f
 
 ########################################
 ### Compile and Install

cmd/irislcd/main.go

@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/irisnet/irishub/app"
-	"github.com/irisnet/irishub/client/lcd"
-	_ "github.com/irisnet/irishub/client/lcd/statik"
+	"github.com/irisnet/irishub/lite"
+	_ "github.com/irisnet/irishub/lite/statik"
 	irisInit "github.com/irisnet/irishub/server/init"
 	"github.com/irisnet/irishub/version"
 	"github.com/spf13/cobra"
@@ -26,7 +26,7 @@ func main() {
 	cdc := app.MakeCodec()
 
 	rootCmd.AddCommand(
-		lcd.ServeLCDStartCommand(cdc),
+		lite.ServeLCDStartCommand(cdc),
 		version.ServeVersionCommand(cdc),
 	)
 

client/lcd/lcd.go → lite/lcd.go

@@ -1,11 +1,9 @@
-package lcd
+package lite
 
 import (
-	"os"
-
 	"net/http"
+	"os"
 
-	"github.com/irisnet/irishub/codec"
 	"github.com/gorilla/mux"
 	"github.com/irisnet/irishub/client"
 	bankhandler "github.com/irisnet/irishub/client/bank/lcd"
@@ -15,10 +13,11 @@ import (
 	keyshandler "github.com/irisnet/irishub/client/keys/lcd"
 	recordhandle "github.com/irisnet/irishub/client/record/lcd"
 	servicehandle "github.com/irisnet/irishub/client/service/lcd"
-	rpchandler "github.com/irisnet/irishub/client/tendermint/rpc"
 	slashinghandler "github.com/irisnet/irishub/client/slashing/lcd"
-	txhandler "github.com/irisnet/irishub/client/tendermint/tx"
 	stakehandler "github.com/irisnet/irishub/client/stake/lcd"
+	rpchandler "github.com/irisnet/irishub/client/tendermint/rpc"
+	txhandler "github.com/irisnet/irishub/client/tendermint/tx"
+	"github.com/irisnet/irishub/codec"
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

client/lcd/lcd_test.go → lite/lcd_test.go

@@ -1,4 +1,4 @@
-package lcd
+package lite
 
 import (
 	"encoding/hex"

client/lcd/swaggerui/swagger.yaml → lite/swagger-ui/swagger.yaml

@@ -2,7 +2,7 @@
 swagger: '2.0'
 info:
   description: A REST interface for state queries, transaction generation, signing, and broadcast.
-  version: "0.8.0"
+  version: "0.9.0"
   title: IRISLCD Swagger-UI
   termsOfService: https://www.irisnet.org
   contact:

client/lcd/test_helpers.go → lite/test_helpers.go

@@ -1,4 +1,4 @@
-package lcd
+package lite
 
 import (
 	"bytes"
@@ -12,23 +12,21 @@ import (
 	"strings"
 	"testing"
 
+	irisapp "github.com/irisnet/irishub/app"
+	"github.com/irisnet/irishub/app/v0"
+	"github.com/irisnet/irishub/client"
+	"github.com/irisnet/irishub/client/keys"
 	"github.com/irisnet/irishub/codec"
 	crkeys "github.com/irisnet/irishub/crypto/keys"
+	"github.com/irisnet/irishub/modules/auth"
+	"github.com/irisnet/irishub/modules/gov"
+	"github.com/irisnet/irishub/modules/stake"
+	"github.com/irisnet/irishub/modules/upgrade"
 	"github.com/irisnet/irishub/server"
 	"github.com/irisnet/irishub/tests"
 	sdk "github.com/irisnet/irishub/types"
-	"github.com/irisnet/irishub/modules/auth"
-
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/require"
-
-	"github.com/irisnet/irishub/modules/stake"
-	irisapp "github.com/irisnet/irishub/app"
-	"github.com/irisnet/irishub/app/v0"
-	"github.com/irisnet/irishub/client"
-	"github.com/irisnet/irishub/client/keys"
-	"github.com/irisnet/irishub/modules/gov"
-	"github.com/irisnet/irishub/modules/upgrade"
 	abci "github.com/tendermint/tendermint/abci/types"
 	tmcfg "github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/crypto"

client/lcd/version.go → lite/version.go

@@ -1,8 +1,9 @@
-package lcd
+package lite
 
 import (
 	"fmt"
 	"net/http"
+
 	"github.com/irisnet/irishub/client/context"
 	"github.com/irisnet/irishub/version"
 )
@@ -16,7 +17,7 @@ func CLIVersionRequestHandler(w http.ResponseWriter, r *http.Request) {
 // connected node version REST handler endpoint
 func NodeVersionRequestHandler(cliCtx context.CLIContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		version, err := cliCtx.Query("/app/version",nil)
+		version, err := cliCtx.Query("/app/version", nil)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(fmt.Sprintf("Could't query version. Error: %s", err.Error())))
@@ -25,4 +26,4 @@ func NodeVersionRequestHandler(cliCtx context.CLIContext) http.HandlerFunc {
 
 		w.Write(version)
 	}
-}
+}

client/lcd/wire.go → lite/wire.go

@@ -1,8 +1,8 @@
-package lcd
+package lite
 
 import (
-	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 	"github.com/irisnet/irishub/codec"
+	ctypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 var cdc = codec.New()