Move pkg top-level

Signed-off-by: Andrea Luzzardi <[email protected]>
blocklayerhq · Nov 30, 2018 · c339ab5 · c339ab5
1 parent 550e24c
commit c339ab5
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 25 deletions.
diff --git a/pkg/builder/builder.go → builder/builder.go b/pkg/builder/builder.go → builder/builder.go
@@ -7,8 +7,8 @@ import (
 	"io/ioutil"
 	"os/exec"
 
-	"github.com/blocklayerhq/chainkit/pkg/project"
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/project"
+	"github.com/blocklayerhq/chainkit/ui"
 )
 
 // Builder is a wrapper around `docker build` which provides a better UX.

diff --git a/pkg/builder/parser.go → builder/parser.go b/pkg/builder/parser.go → builder/parser.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/acarl005/stripansi"
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/schollz/progressbar"
 )
 

diff --git a/cmd/build.go b/cmd/build.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"context"
 
-	"github.com/blocklayerhq/chainkit/pkg/builder"
-	"github.com/blocklayerhq/chainkit/pkg/project"
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/builder"
+	"github.com/blocklayerhq/chainkit/project"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/cli.go b/cmd/cli.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"context"
 
-	"github.com/blocklayerhq/chainkit/pkg/project"
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/project"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/create.go b/cmd/create.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/blocklayerhq/chainkit/pkg/builder"
-	"github.com/blocklayerhq/chainkit/pkg/httpfs"
-	"github.com/blocklayerhq/chainkit/pkg/project"
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/builder"
+	"github.com/blocklayerhq/chainkit/httpfs"
+	"github.com/blocklayerhq/chainkit/project"
 	"github.com/blocklayerhq/chainkit/templates"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -7,7 +7,7 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/init.go b/cmd/init.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/blocklayerhq/chainkit/pkg/project"
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/project"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 )

diff --git a/cmd/start.go b/cmd/start.go
@@ -3,11 +3,12 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
 	"path"
 
-	"github.com/blocklayerhq/chainkit/pkg/discovery"
-	"github.com/blocklayerhq/chainkit/pkg/project"
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/discovery"
+	"github.com/blocklayerhq/chainkit/project"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/spf13/cobra"
 )
 
@@ -70,21 +71,28 @@ func start(p *project.Project, join string) {
 		ui.Verbose("IPFS Swarm announcing %s", addr)
 	}
 
+	genesisPath := path.Join(p.RootDir, "data", fmt.Sprintf("%sd", p.Name), "config", "genesis.json")
+
 	// Start a network.
 	if join == "" {
-		genesis := path.Join(p.RootDir, "data", fmt.Sprintf("%sd", p.Name), "config", "genesis.json")
-		chainID, err := s.Announce(ctx, genesis)
+		chainID, err := s.Announce(ctx, genesisPath)
 		if err != nil {
 			ui.Fatal("%v", err)
 		}
 		ui.Success("Network is live at: %v", chainID)
 	} else {
 		ui.Info("Joining network %s", join)
-		genesis, peerCh, err := s.Join(ctx, join)
+		genesisData, peerCh, err := s.Join(ctx, join)
 		if err != nil {
 			ui.Fatal("%v", err)
 		}
-		ui.Info("Genesis: %s", genesis)
+
+		ui.Success("Retrieved genesis data")
+
+		if err := ioutil.WriteFile(genesisPath, genesisData, 0644); err != nil {
+			ui.Fatal("Unable to write genesis file: %v", err)
+		}
+
 		peer := <-peerCh
 		ui.Info("Peer: %v", peer.Addrs)
 	}

diff --git a/cmd/utils.go b/cmd/utils.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/spf13/cobra"
 )
 

diff --git a/pkg/discovery/discovery.go → discovery/discovery.go b/pkg/discovery/discovery.go → discovery/discovery.go
@@ -11,7 +11,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/blocklayerhq/chainkit/pkg/ui"
+	"github.com/blocklayerhq/chainkit/ui"
 	"github.com/ipsn/go-ipfs/core"
 	"github.com/ipsn/go-ipfs/core/coreapi"
 	iface "github.com/ipsn/go-ipfs/core/coreapi/interface"

diff --git a/pkg/httpfs/utils.go → httpfs/utils.go b/pkg/httpfs/utils.go → httpfs/utils.go
diff --git a/pkg/project/project.go → project/project.go b/pkg/project/project.go → project/project.go
diff --git a/pkg/ui/tree.go → ui/tree.go b/pkg/ui/tree.go → ui/tree.go
diff --git a/pkg/ui/ui.go → ui/ui.go b/pkg/ui/ui.go → ui/ui.go
diff --git a/pkg/version/version.go → version/version.go b/pkg/version/version.go → version/version.go