Merge pull request #2 from GenesisKernel/new-config

Updated import

Author: dchertkov

main.go

@@ -27,10 +27,11 @@ const (
 	systemPort     = 7078
 
 	waitTablesCount = 32
-	demoPageURL     = "https://raw.githubusercontent.com/GenesisKernel/apps/demo_apps_14/demo_apps.json"
-	serveKeysPort   = 85
+	demoPageURL     = "https://raw.githubusercontent.com/GenesisKernel/apps/7af853ac247315cd67fb685694ffad54bc3c4732/quick-start-simple/quick-start.json"
 
 	walletBalance = 100
+
+	apiBaseURL = "http://localhost:7079/api/v2"
 )
 
 var (
@@ -60,7 +61,6 @@ func main() {
 	stop := flag.Bool("stop", false, "Stops the current session without clearing the data.")
 	restart := flag.Bool("restart", false, "Restarts the previous installation attempt.")
 	clear := flag.Bool("clean", false, "Removes all nodes and databases.")
-	slowInstall := flag.Bool("slow", false, "Slow installation for older computers.")
 	flag.Parse()
 
 	if (*start != 0 && (*stop || *restart || *clear)) ||
@@ -72,7 +72,7 @@ func main() {
 	}
 
 	if *start != 0 {
-		startNodes(*start, 5430, *slowInstall)
+		startNodes(*start)
 		return
 	}
 
@@ -96,8 +96,7 @@ func main() {
 2. Type "c" to remove all nodes and databases 
 3. Type "r" to restart the previous installation 
 4. Type "s" to stop the services without clearing the data 
-5. Type "si" to run a slow installation in case of errors during the normal install 
-6. Type "q" to exit.`)
+5. Type "q" to exit.`)
 		fmt.Print("> ")
 		var action string
 		_, err := fmt.Scanf("%s \n", &action)
@@ -113,24 +112,14 @@ func main() {
 				if err != nil {
 					fmt.Println("Error: ", err)
 				} else {
-					startNodes(nodesNumber, 5430, false)
+					startNodes(nodesNumber)
 				}
 			case "c":
 				clearNodes()
 			case "r":
 				restartNodes()
 			case "s":
 				stopNodes()
-			case "si":
-				var nodesNumber int
-				fmt.Println("How many nodes do you want to install? Example: 3")
-				fmt.Print("> ")
-				_, err := fmt.Scanf("%d \n", &nodesNumber)
-				if err != nil {
-					fmt.Println("Error: ", err)
-				} else {
-					startNodes(nodesNumber, 5430, true)
-				}
 			}
 		}
 		if action == "q" {

restart.go

@@ -23,12 +23,6 @@ func restartNodes() error {
 		return err
 	}
 
-	server, err := startServingFiles(len(files) - 2)
-	if err != nil {
-		return err
-	}
-	defer server.Close()
-
 	fmt.Print("Starting centrifugo... ")
 	err = startCentrifugo()
 	if err != nil {

start.go

@@ -2,10 +2,9 @@ package main
 
 import (
 	"fmt"
-	"time"
 )
 
-func startNodes(nodesNumber int, psqlPort int64, slowInstall bool) {
+func startNodes(nodesNumber int) {
 	defer killProcesses()
 
 	fmt.Println("Checking ports for availability")
@@ -23,10 +22,6 @@ func startNodes(nodesNumber int, psqlPort int64, slowInstall bool) {
 	}
 	fmt.Println("OK")
 
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
-	}
-
 	fmt.Print("Installing a local copy of postgres... ")
 	err = installPostgres()
 	if err != nil {
@@ -35,18 +30,6 @@ func startNodes(nodesNumber int, psqlPort int64, slowInstall bool) {
 	}
 	fmt.Println("OK")
 
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
-	}
-
-	fmt.Print("Updating postgres config... ")
-	err = changePostgresPort(psqlPort)
-	if err != nil {
-		fmt.Println("Error: ", err)
-		return
-	}
-	fmt.Println("OK")
-
 	fmt.Println("Connecting to postgres database")
 	err = startPostgres()
 	if err != nil {
@@ -59,10 +42,6 @@ func startNodes(nodesNumber int, psqlPort int64, slowInstall bool) {
 		return
 	}
 
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
-	}
-
 	err = makeDirs(nodesNumber)
 	if err != nil {
 		return
@@ -78,55 +57,33 @@ func startNodes(nodesNumber int, psqlPort int64, slowInstall bool) {
 		return
 	}
 
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
+	if err = upNodes(nodesNumber); err != nil {
+		return
 	}
 
-	server, err := startServingFiles(nodesNumber)
+	fmt.Print("Updating keys... ")
+	err = updateKeys(nodesNumber)
 	if err != nil {
 		fmt.Println("Error: ", err)
 		return
 	}
-	defer server.Close()
+	fmt.Println("OK")
 
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
-	}
 	fmt.Print("Updating the full_nodes parameter... ")
 	err = updateFullNodes(nodesNumber)
 	if err != nil {
 		fmt.Println("Error: ", err)
 		return
 	}
-
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
-	}
-	fmt.Print("Updating keys...")
-	err = updateKeys(nodesNumber)
-	if err != nil {
-		fmt.Println("Error: ", err)
-		return
-	}
 	fmt.Println("OK")
 
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
-	}
 	fmt.Print("Installing demo applications... ")
 	err = installDemoPage()
 	if err != nil {
-		fmt.Println("Error: ", err)
-		return
-	}
-
-	if slowInstall {
-		time.Sleep(time.Minute * 2)
-	}
-	err = connectNodes(nodesNumber)
-	if err != nil {
+		fmt.Println("Error:", err)
 		return
 	}
+	fmt.Println("OK")
 
 	err = startFront(nodesNumber)
 	if err != nil {

structs.go

@@ -1,7 +1,5 @@
 package main
 
-import "fmt"
-
 type getUIDResult struct {
 	UID         string `json:"uid,omitempty"`
 	Token       string `json:"token,omitempty"`
@@ -29,10 +27,11 @@ type loginResult struct {
 }
 
 type prepareResult struct {
-	ForSign string            `json:"forsign"`
-	Signs   []TxSignJSON      `json:"signs"`
-	Values  map[string]string `json:"values"`
-	Time    string            `json:"time"`
+	RequestID string            `json:"request_id"`
+	ForSign   string            `json:"forsign"`
+	Signs     []TxSignJSON      `json:"signs"`
+	Values    map[string]string `json:"values"`
+	Time      string            `json:"time"`
 }
 
 type TxSignJSON struct {
@@ -65,11 +64,8 @@ type txstatusError struct {
 }
 
 type nodeValue struct {
-	Host   string
-	KeyID  string
-	PubKey string
-}
-
-func (nv *nodeValue) String() string {
-	return fmt.Sprintf(`["%s", "%s", "%s"]`, nv.Host, nv.KeyID, nv.PubKey)
+	TCPAddr string `json:"tcp_address"`
+	APIAddr string `json:"api_address"`
+	KeyID   string `json:"key_id"`
+	PubKey  string `json:"public_key"`
 }