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

benchmark.go

@@ -9,16 +9,15 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/harmony-one/harmony/p2p/p2pimpl"
-
 	"github.com/harmony-one/harmony/consensus"
-	"github.com/harmony-one/harmony/db"
 	"github.com/harmony-one/harmony/internal/attack"
+	"github.com/harmony-one/harmony/internal/db"
+	"github.com/harmony-one/harmony/internal/profiler"
 	"github.com/harmony-one/harmony/log"
 	pkg_newnode "github.com/harmony-one/harmony/newnode"
 	"github.com/harmony-one/harmony/node"
 	"github.com/harmony-one/harmony/p2p"
-	"github.com/harmony-one/harmony/profiler"
+	"github.com/harmony-one/harmony/p2p/p2pimpl"
 )
 
 var (

consensus/consensus_leader.go

@@ -4,22 +4,21 @@ import (
 	"bytes"
 	"encoding/hex"
 	"errors"
-	"github.com/ethereum/go-ethereum/rlp"
 	"strconv"
 	"time"
 
-	"github.com/harmony-one/harmony/core/types"
-	"github.com/harmony-one/harmony/p2p/host"
-	"github.com/harmony-one/harmony/services/explorer"
-
-	consensus_proto "github.com/harmony-one/harmony/api/consensus"
-	"github.com/harmony-one/harmony/profiler"
-
 	"github.com/dedis/kyber"
 	"github.com/dedis/kyber/sign/schnorr"
+	"github.com/ethereum/go-ethereum/rlp"
+
+	consensus_proto "github.com/harmony-one/harmony/api/consensus"
+	"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 (

core/blockchain.go

@@ -27,8 +27,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	hdb "github.com/harmony-one/harmony/db"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/mclock"
 	"github.com/ethereum/go-ethereum/common/prque"
@@ -43,6 +41,7 @@ import (
 	"github.com/harmony-one/harmony/core/state"
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/core/vm"
+	hdb "github.com/harmony-one/harmony/internal/db"
 	"github.com/harmony-one/harmony/trie"
 	"github.com/hashicorp/golang-lru"
 )

core/chain_makers.go

@@ -20,14 +20,13 @@ import (
 	"fmt"
 	"math/big"
 
-	hdb "github.com/harmony-one/harmony/db"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/harmony-one/harmony/consensus"
 	"github.com/harmony-one/harmony/core/state"
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/core/vm"
+	hdb "github.com/harmony-one/harmony/internal/db"
 )
 
 // BlockGen creates blocks for testing.

core/genesis.go

@@ -32,7 +32,7 @@ import (
 	"github.com/harmony-one/harmony/core/rawdb"
 	"github.com/harmony-one/harmony/core/state"
 	"github.com/harmony-one/harmony/core/types"
-	hdb "github.com/harmony-one/harmony/db"
+	hdb "github.com/harmony-one/harmony/internal/db"
 )
 
 //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go

core/headerchain.go

@@ -32,7 +32,7 @@ import (
 	"github.com/harmony-one/harmony/consensus"
 	"github.com/harmony-one/harmony/core/rawdb"
 	"github.com/harmony-one/harmony/core/types"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 	"github.com/hashicorp/golang-lru"
 )
 

core/state/database.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 	"github.com/harmony-one/harmony/trie"
 	lru "github.com/hashicorp/golang-lru"
 )

core/state/managed_state_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 var addr = common.BytesToAddress([]byte("test"))

core/state/state_test.go

@@ -21,10 +21,9 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/harmony-one/harmony/db"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/harmony-one/harmony/internal/db"
 	checker "gopkg.in/check.v1"
 )
 

core/state/statedb_test.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/harmony-one/harmony/core/types"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 // Tests that updating a state trie does not leak any database writes prior to

core/tx_pool_test.go

@@ -32,7 +32,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/harmony-one/harmony/core/state"
 	"github.com/harmony-one/harmony/core/types"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 // testTxPoolConfig is a transaction pool configuration without stateful disk

core/vm/runtime/runtime.go

@@ -26,7 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/harmony-one/harmony/core/state"
 	"github.com/harmony-one/harmony/core/vm"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 // Config is a basic type specifying certain configuration flags for running

core/vm/runtime/runtime_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/harmony-one/harmony/core/state"
 	"github.com/harmony-one/harmony/core/vm"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 func TestDefaults(t *testing.T) {

harmony/main.go

@@ -3,17 +3,17 @@ package main
 import (
 	"encoding/hex"
 	"fmt"
-	"github.com/ethereum/go-ethereum/common"
 	"log"
 	"math/big"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/harmony-one/harmony/consensus"
 	"github.com/harmony-one/harmony/core"
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/core/vm"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 	"github.com/harmony-one/harmony/node/worker"
 )
 

node/node.go

@@ -6,7 +6,6 @@ import (
 	"encoding/gob"
 	"encoding/hex"
 	"fmt"
-	"github.com/ethereum/go-ethereum/rlp"
 	"math/big"
 	"os"
 	"strconv"
@@ -15,25 +14,24 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/harmony-one/harmony/services/explorer"
-
-	"github.com/harmony-one/harmony/client"
-	clientService "github.com/harmony-one/harmony/client/service"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/harmony-one/harmony/client"
+	clientService "github.com/harmony-one/harmony/client/service"
 	bft "github.com/harmony-one/harmony/consensus"
 	"github.com/harmony-one/harmony/core"
 	"github.com/harmony-one/harmony/core/types"
 	"github.com/harmony-one/harmony/core/vm"
 	"github.com/harmony-one/harmony/crypto/pki"
-	hdb "github.com/harmony-one/harmony/db"
+	hdb "github.com/harmony-one/harmony/internal/db"
 	"github.com/harmony-one/harmony/log"
 	"github.com/harmony-one/harmony/node/worker"
 	"github.com/harmony-one/harmony/p2p"
 	"github.com/harmony-one/harmony/p2p/host"
 	proto_node "github.com/harmony-one/harmony/proto/node"
+	"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"

services/explorer/storage.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/harmony-one/harmony/core/types"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 	"github.com/harmony-one/harmony/log"
 )
 

trie/database.go

@@ -26,7 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/rlp"
-	hdb "github.com/harmony-one/harmony/db"
+	hdb "github.com/harmony-one/harmony/internal/db"
 )
 
 var (

trie/iterator_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
-	hdb "github.com/harmony-one/harmony/db"
+	hdb "github.com/harmony-one/harmony/internal/db"
 )
 
 func TestIterator(t *testing.T) {

trie/proof.go

@@ -20,12 +20,11 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/harmony-one/harmony/db"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 // Prove constructs a merkle proof for key. The result contains all encoded nodes

trie/secure_trie_test.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 func newEmptySecure() *SecureTrie {

trie/sync_test.go

@@ -20,9 +20,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/harmony-one/harmony/db"
-
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 // makeTestTrie create a sample test trie to test node-wise reconstruction.

trie/trie_test.go

@@ -33,7 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/harmony-one/harmony/db"
+	"github.com/harmony-one/harmony/internal/db"
 )
 
 func init() {