Merge branch 'master' of github.com:harmony-one/harmony into rj_branch

README.md

@@ -10,7 +10,6 @@
 
 ## Dev Environment Setup
 
-
 ```
 export GOPATH=$HOME/<path_of_your_choice>
 

api/services/explorer/test2/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/harmony-one/harmony/services/explorer"
+import "github.com/harmony-one/harmony/api/services/explorer"
 
 func main() {
 	service := &explorer.Service{

api/services/syncing/downloader/client.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"time"
 
-	pb "github.com/harmony-one/harmony/services/syncing/downloader/proto"
+	pb "github.com/harmony-one/harmony/api/services/syncing/downloader/proto"
 	"google.golang.org/grpc"
 )
 

api/services/syncing/downloader/interface.go

@@ -1,7 +1,7 @@
 package downloader
 
 import (
-	pb "github.com/harmony-one/harmony/services/syncing/downloader/proto"
+	pb "github.com/harmony-one/harmony/api/services/syncing/downloader/proto"
 )
 
 // DownloadInterface is the interface for downloader package.

api/services/syncing/downloader/server.go

@@ -7,7 +7,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	pb "github.com/harmony-one/harmony/services/syncing/downloader/proto"
+	pb "github.com/harmony-one/harmony/api/services/syncing/downloader/proto"
 )
 
 // Constants for downloader server.

api/services/syncing/syncing.go

@@ -2,16 +2,17 @@ package syncing
 
 import (
 	"bytes"
-	"github.com/harmony-one/harmony/core"
 	"reflect"
 	"sort"
 	"sync"
 	"time"
 
+	"github.com/harmony-one/harmony/core"
+
 	"github.com/Workiva/go-datastructures/queue"
+	"github.com/harmony-one/harmony/api/services/syncing/downloader"
 	"github.com/harmony-one/harmony/log"
 	"github.com/harmony-one/harmony/p2p"
-	"github.com/harmony-one/harmony/services/syncing/downloader"
 )
 
 // Constants for syncing.

consensus/consensus_leader.go

@@ -12,13 +12,13 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 
 	consensus_proto "github.com/harmony-one/harmony/api/consensus"
+	"github.com/harmony-one/harmony/api/services/explorer"
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/crypto"
 	"github.com/harmony-one/harmony/internal/profiler"
 	"github.com/harmony-one/harmony/log"
 	"github.com/harmony-one/harmony/p2p"
 	"github.com/harmony-one/harmony/p2p/host"
-	"github.com/harmony-one/harmony/services/explorer"
 )
 
 const (

node/node.go

@@ -19,6 +19,10 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 	proto_node "github.com/harmony-one/harmony/api/proto/node"
+	"github.com/harmony-one/harmony/api/services/explorer"
+	"github.com/harmony-one/harmony/api/services/syncing"
+	"github.com/harmony-one/harmony/api/services/syncing/downloader"
+	downloader_pb "github.com/harmony-one/harmony/api/services/syncing/downloader/proto"
 	"github.com/harmony-one/harmony/client"
 	clientService "github.com/harmony-one/harmony/client/service"
 	bft "github.com/harmony-one/harmony/consensus"
@@ -31,10 +35,6 @@ import (
 	"github.com/harmony-one/harmony/node/worker"
 	"github.com/harmony-one/harmony/p2p"
 	"github.com/harmony-one/harmony/p2p/host"
-	"github.com/harmony-one/harmony/services/explorer"
-	"github.com/harmony-one/harmony/services/syncing"
-	"github.com/harmony-one/harmony/services/syncing/downloader"
-	downloader_pb "github.com/harmony-one/harmony/services/syncing/downloader/proto"
 )
 
 // State is a state of a node.