Merge pull request expanse-org#25 from happyuc-project/master

Merge master debug
gitter-badger · May 31, 2018 · 14cca8f · 14cca8f
2 parents 148f559 + d860511
commit 14cca8f
Show file tree

Hide file tree

Showing 68 changed files with 266 additions and 271 deletions.
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
@@ -34,9 +34,9 @@ import (
 	"github.com/happyuc-project/happyuc-go/core/state"
 	"github.com/happyuc-project/happyuc-go/core/types"
 	"github.com/happyuc-project/happyuc-go/core/vm"
+	"github.com/happyuc-project/happyuc-go/event"
 	"github.com/happyuc-project/happyuc-go/huc/filters"
 	"github.com/happyuc-project/happyuc-go/hucdb"
-	"github.com/happyuc-project/happyuc-go/event"
 	"github.com/happyuc-project/happyuc-go/params"
 	"github.com/happyuc-project/happyuc-go/rpc"
 )

diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go
@@ -243,7 +243,9 @@ func (ac *accountCache) scanAccounts() error {
 	// Create a helper method to scan the contents of the key files
 	var (
 		buf = new(bufio.Reader)
-		key struct{ Address string `json:"address"` }
+		key struct {
+			Address string `json:"address"`
+		}
 	)
 	readAccount := func(path string) *accounts.Account {
 		fd, err := os.Open(path)

diff --git a/accounts/usbwallet/internal/trezor/messages.pb.go b/accounts/usbwallet/internal/trezor/messages.pb.go
diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go
@@ -27,13 +27,13 @@ import (
 	"io"
 	"math/big"
 
+	"github.com/golang/protobuf/proto"
 	"github.com/happyuc-project/happyuc-go/accounts"
 	"github.com/happyuc-project/happyuc-go/accounts/usbwallet/internal/trezor"
 	"github.com/happyuc-project/happyuc-go/common"
 	"github.com/happyuc-project/happyuc-go/common/hexutil"
 	"github.com/happyuc-project/happyuc-go/core/types"
 	"github.com/happyuc-project/happyuc-go/log"
-	"github.com/golang/protobuf/proto"
 )
 
 // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In

diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go
@@ -82,11 +82,11 @@ type wallet struct {
 	accounts []accounts.Account                         // List of derive accounts pinned on the hardware wallet
 	paths    map[common.Address]accounts.DerivationPath // Known derivation paths for signing operations
 
-	deriveNextPath accounts.DerivationPath   // Next derivation path for account auto-discovery
-	deriveNextAddr common.Address            // Next derived account address for auto-discovery
+	deriveNextPath accounts.DerivationPath  // Next derivation path for account auto-discovery
+	deriveNextAddr common.Address           // Next derived account address for auto-discovery
 	deriveChain    happyuc.ChainStateReader // Blockchain state reader to discover used account with
-	deriveReq      chan chan struct{}        // Channel to request a self-derivation on
-	deriveQuit     chan chan error           // Channel to terminate the self-deriver with
+	deriveReq      chan chan struct{}       // Channel to request a self-derivation on
+	deriveQuit     chan chan error          // Channel to terminate the self-deriver with
 
 	healthQuit chan chan error
 

diff --git a/cmd/ghuc/chaincmd.go b/cmd/ghuc/chaincmd.go
@@ -31,9 +31,9 @@ import (
 	"github.com/happyuc-project/happyuc-go/core"
 	"github.com/happyuc-project/happyuc-go/core/state"
 	"github.com/happyuc-project/happyuc-go/core/types"
+	"github.com/happyuc-project/happyuc-go/event"
 	"github.com/happyuc-project/happyuc-go/huc/downloader"
 	"github.com/happyuc-project/happyuc-go/hucdb"
-	"github.com/happyuc-project/happyuc-go/event"
 	"github.com/happyuc-project/happyuc-go/log"
 	"github.com/happyuc-project/happyuc-go/trie"
 	"github.com/syndtr/goleveldb/leveldb/util"

diff --git a/cmd/ghuc/consolecmd_test.go b/cmd/ghuc/consolecmd_test.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"crypto/rand"
+	"github.com/happyuc-project/happyuc-go/params"
 	"math/big"
 	"os"
 	"path/filepath"
@@ -26,7 +27,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-	"github.com/happyuc-project/happyuc-go/params"
 )
 
 const (

diff --git a/cmd/ghuc/main.go b/cmd/ghuc/main.go
@@ -28,6 +28,7 @@ import (
 	"github.com/happyuc-project/happyuc-go/accounts"
 	"github.com/happyuc-project/happyuc-go/accounts/keystore"
 	"github.com/happyuc-project/happyuc-go/cmd/utils"
+	"github.com/happyuc-project/happyuc-go/common"
 	"github.com/happyuc-project/happyuc-go/console"
 	"github.com/happyuc-project/happyuc-go/huc"
 	"github.com/happyuc-project/happyuc-go/hucclient"
@@ -36,7 +37,6 @@ import (
 	"github.com/happyuc-project/happyuc-go/metrics"
 	"github.com/happyuc-project/happyuc-go/node"
 	"gopkg.in/urfave/cli.v1"
-	"github.com/happyuc-project/happyuc-go/common"
 )
 
 const (

diff --git a/cmd/ghuc/monitorcmd.go b/cmd/ghuc/monitorcmd.go
@@ -25,10 +25,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gizak/termui"
 	"github.com/happyuc-project/happyuc-go/cmd/utils"
 	"github.com/happyuc-project/happyuc-go/node"
 	"github.com/happyuc-project/happyuc-go/rpc"
-	"github.com/gizak/termui"
 	"gopkg.in/urfave/cli.v1"
 )
 

diff --git a/cmd/ghuc/run_test.go b/cmd/ghuc/run_test.go
@@ -38,8 +38,8 @@ type testghuc struct {
 	*cmdtest.TestCmd
 
 	// template variables for expect
-	Datadir   string
-	Coinbase  string
+	Datadir  string
+	Coinbase string
 }
 
 func init() {

diff --git a/cmd/pupphuc/genesis.go b/cmd/pupphuc/genesis.go
@@ -32,7 +32,7 @@ import (
 // C++ HappyUC implementation.
 type cppHappyUCGenesisSpec struct {
 	SealEngine string `json:"sealEngine"`
-	Params struct {
+	Params     struct {
 		AccountStartNonce       hexutil.Uint64 `json:"accountStartNonce"`
 		HomesteadForkBlock      hexutil.Uint64 `json:"homesteadForkBlock"`
 		EIP150ForkBlock         hexutil.Uint64 `json:"EIP150ForkBlock"`
@@ -164,7 +164,7 @@ func newCppHappyUCGenesisSpec(network string, genesis *core.Genesis) (*cppHappyU
 
 // parityChainSpec is the chain specification format used by Parity.
 type parityChainSpec struct {
-	Name string `json:"name"`
+	Name   string `json:"name"`
 	Engine struct {
 		Huchash struct {
 			Params struct {

diff --git a/cmd/pupphuc/module_node.go b/cmd/pupphuc/module_node.go
@@ -102,7 +102,7 @@ func deployNode(client *sshClient, network string, bootnodes []string, config *n
 		"LightFlag": lightFlag,
 		"Bootnodes": strings.Join(bootnodes, ","),
 		"Hucstats":  config.hucstats,
-		"Coinbase": config.coinbase,
+		"Coinbase":  config.coinbase,
 		"GasTarget": uint64(1000000 * config.gasTarget),
 		"GasPrice":  uint64(1000000000 * config.gasPrice),
 		"Unlock":    config.keyJSON != "",
@@ -120,7 +120,7 @@ func deployNode(client *sshClient, network string, bootnodes []string, config *n
 		"Light":      config.peersLight > 0,
 		"LightPeers": config.peersLight,
 		"Hucstats":   config.hucstats[:strings.Index(config.hucstats, ":")],
-		"Coinbase":  config.coinbase,
+		"Coinbase":   config.coinbase,
 		"GasTarget":  config.gasTarget,
 		"GasPrice":   config.gasPrice,
 	})

diff --git a/consensus/huchash/consensus.go b/consensus/huchash/consensus.go
@@ -386,7 +386,7 @@ func calcDifficultyHomestead(time uint64, parent *types.Header) *big.Int {
 	// https://github.com/happyuc-project/HIPs/blob/master/EIPS/eip-2.md
 	// algorithm:
 	// diff = (parent_diff +
-	//         (parent_diff / 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99))
+	//         (parent_diff / 2048 * max(1 - (block_timestamp - parent_timestamp) / 10, -99))
 	//        ) + 2^(periodCount - 2)
 
 	bigTime := new(big.Int).SetUint64(time)
@@ -396,16 +396,16 @@ func calcDifficultyHomestead(time uint64, parent *types.Header) *big.Int {
 	x := new(big.Int)
 	y := new(big.Int)
 
-	// 1 - (block_timestamp - parent_timestamp) // 10
+	// 1 - (block_timestamp - parent_timestamp) / 10
 	x.Sub(bigTime, bigParentTime)
 	x.Div(x, big10)
 	x.Sub(big1, x)
 
-	// max(1 - (block_timestamp - parent_timestamp) // 10, -99)
+	// max(1 - (block_timestamp - parent_timestamp) / 10, -99)
 	if x.Cmp(bigMinus99) < 0 {
 		x.Set(bigMinus99)
 	}
-	// (parent_diff + parent_diff // 2048 * max(1 - (block_timestamp - parent_timestamp) // 10, -99))
+	// (parent_diff + parent_diff / 2048 * max(1 - (block_timestamp - parent_timestamp) / 10, -99))
 	y.Div(parent.Difficulty, params.DifficultyBoundDivisor)
 	x.Mul(y, x)
 	x.Add(parent.Difficulty, x)

diff --git a/consensus/huchash/huchash.go b/consensus/huchash/huchash.go
@@ -404,7 +404,7 @@ type Huchash struct {
 	hashrate metrics.Meter // Meter tracking the average hashrate
 
 	// The fields below are hooks for testing
-	shared    *Huchash       // Shared PoW verifier to avoid cache regeneration
+	shared    *Huchash      // Shared PoW verifier to avoid cache regeneration
 	fakeFail  uint64        // Block number which fails PoW check even in fake mode
 	fakeDelay time.Duration // Time delay to sleep for before returning from verify
 

diff --git a/console/console_test.go b/console/console_test.go
@@ -96,9 +96,9 @@ func newTester(t *testing.T, confOverride func(*huc.Config)) *tester {
 		t.Fatalf("failed to create node: %v", err)
 	}
 	hucConf := &huc.Config{
-		Genesis : core.DeveloperGenesisBlock(15, common.Address{}),
+		Genesis:  core.DeveloperGenesisBlock(15, common.Address{}),
 		Coinbase: common.HexToAddress(testAddress),
-		Huchash : huchash.Config{
+		Huchash: huchash.Config{
 			PowMode: huchash.ModeTest,
 		},
 	}
@@ -117,7 +117,7 @@ func newTester(t *testing.T, confOverride func(*huc.Config)) *tester {
 		t.Fatalf("failed to attach to node: %v", err)
 	}
 	prompter := &hookedPrompter{scheduler: make(chan string)}
-	printer  := new(bytes.Buffer)
+	printer := new(bytes.Buffer)
 
 	console, err := New(Config{
 		DataDir:  stack.InstanceDir(),

diff --git a/contracts/chequebook/contract/chequebook.go b/contracts/chequebook/contract/chequebook.go
diff --git a/contracts/ens/contract/ens.go b/contracts/ens/contract/ens.go
diff --git a/contracts/ens/contract/publicresolver.go b/contracts/ens/contract/publicresolver.go
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -34,8 +34,8 @@ import (
 	"github.com/happyuc-project/happyuc-go/core/types"
 	"github.com/happyuc-project/happyuc-go/core/vm"
 	"github.com/happyuc-project/happyuc-go/crypto"
-	"github.com/happyuc-project/happyuc-go/hucdb"
 	"github.com/happyuc-project/happyuc-go/event"
+	"github.com/happyuc-project/happyuc-go/hucdb"
 	"github.com/happyuc-project/happyuc-go/log"
 	"github.com/happyuc-project/happyuc-go/metrics"
 	"github.com/happyuc-project/happyuc-go/params"
@@ -691,7 +691,7 @@ func (bc *BlockChain) procFutureBlocks() {
 type WriteStatus byte
 
 const (
-	NonStatTy   WriteStatus = iota
+	NonStatTy WriteStatus = iota
 	CanonStatTy
 	SideStatTy
 )

diff --git a/core/chain_indexer.go b/core/chain_indexer.go
@@ -25,8 +25,8 @@ import (
 
 	"github.com/happyuc-project/happyuc-go/common"
 	"github.com/happyuc-project/happyuc-go/core/types"
-	"github.com/happyuc-project/happyuc-go/hucdb"
 	"github.com/happyuc-project/happyuc-go/event"
+	"github.com/happyuc-project/happyuc-go/hucdb"
 	"github.com/happyuc-project/happyuc-go/log"
 )