Merge pull request #713 from u5surf/issue-708

Issue 708

api/proto/discovery/pingpong_test.go

@@ -89,6 +89,9 @@ func TestSerialize(test *testing.T) {
 	buf2 = pong1.ConstructPongMessage()
 
 	msg2, err := proto.GetMessagePayload(buf2)
+	if err != nil {
+		test.Error("GetMessagePayload Failed!")
+	}
 	pong, err := GetPongMessage(msg2)
 	if err != nil {
 		test.Error("Pong failed!")

api/proto/node/node_test.go

@@ -55,8 +55,8 @@ func TestConstructTransactionListMessageAccount(t *testing.T) {
 
 func TestConstructRequestTransactionsMessage(t *testing.T) {
 	txIDs := [][]byte{
-		[]byte{1, 2},
+		{1, 2},
-		[]byte{3, 4},
+		{3, 4},
 	}
 
 	buf := ConstructRequestTransactionsMessage(txIDs)

api/service/discovery/service.go

@@ -103,7 +103,7 @@ func (s *Service) contactP2pPeers() {
 		case <-tick.C:
 			for g, a := range s.config.Actions {
 				if a == p2p.ActionPause {
-					// Recived Pause Message, to reduce the frequency of ping message to every 1 minute
+					// Received Pause Message, to reduce the frequency of ping message to every 1 minute
 					// TODO (leo) use different timer tick for different group, mainly differentiate beacon and regular shards
 					// beacon ping could be less frequent than regular shard
 					tick.Stop()

api/service/explorer/service.go

@@ -146,12 +146,19 @@ func (s *Service) GetExplorerBlocks(w http.ResponseWriter, r *http.Request) {
 	}
 	db := s.storage.GetDB()
 	fromInt, err := strconv.Atoi(from)
+	if err != nil {
+		json.NewEncoder(w).Encode(data.Blocks)
+		return
+	}
 	var toInt int
 	if to == "" {
+		toInt, err = func() (int, error) {
 			bytes, err := db.Get([]byte(BlockHeightKey))
 			if err == nil {
-			toInt, err = strconv.Atoi(string(bytes))
+				return strconv.Atoi(string(bytes))
 			}
+			return toInt, err
+		}()
 	} else {
 		toInt, err = strconv.Atoi(to)
 	}

api/service/syncing/syncing.go

@@ -555,7 +555,7 @@ func (peerConfig *SyncPeerConfig) registerToBroadcast(peerHash []byte, ip, port
 }
 
 // RegisterNodeInfo will register node to peers to accept future new block broadcasting
-// return number of successfull registration
+// return number of successful registration
 func (ss *StateSync) RegisterNodeInfo() int {
 	registrationNumber := RegistrationNumber
 	utils.GetLogInstance().Debug("[SYNC] node registration to peers",

api/service/syncing/syncing_test.go

@@ -10,7 +10,7 @@ import (
 // Simple test for IncorrectResponse
 func TestCreateTestSyncPeerConfig(t *testing.T) {
 	client := &downloader.Client{}
-	blockHashes := [][]byte{[]byte{}}
+	blockHashes := [][]byte{{}}
 	syncPeerConfig := CreateTestSyncPeerConfig(client, blockHashes)
 	assert.Equal(t, client, syncPeerConfig.GetClient(), "error")
 }
@@ -18,9 +18,9 @@ func TestCreateTestSyncPeerConfig(t *testing.T) {
 // Simple test for IncorrectResponse
 func TestCompareSyncPeerConfigByblockHashes(t *testing.T) {
 	client := &downloader.Client{}
-	blockHashes1 := [][]byte{[]byte{1, 2, 3}}
+	blockHashes1 := [][]byte{{1, 2, 3}}
 	syncPeerConfig1 := CreateTestSyncPeerConfig(client, blockHashes1)
-	blockHashes2 := [][]byte{[]byte{1, 2, 4}}
+	blockHashes2 := [][]byte{{1, 2, 4}}
 	syncPeerConfig2 := CreateTestSyncPeerConfig(client, blockHashes2)
 
 	// syncPeerConfig1 is less than syncPeerConfig2

consensus/consensus_validator_test.go

@@ -79,8 +79,14 @@ func TestProcessMessageValidatorAnnounce(test *testing.T) {
 		test.Fatalf("Cannot craeate consensus: %v", err)
 	}
 	blockBytes, err := hex.DecodeString("f902a5f902a0a00000000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000a02b418211410ee3e75b32abd925bbeba215172afa509d65c1953d4b4e505a4a2aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808080a000000000000000000000000000000000000000000000000000000000000000008800000000000000008400000001b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000c0c0")
+	if err != nil {
+		test.Fatalf("Cannot decode blockByte: %v", err)
+	}
 	consensusLeader.block = blockBytes
 	hashBytes, err := hex.DecodeString("bdd66a8211ffcbf0ad431b506c854b49264951fd9f690928e9cf44910c381053")
+	if err != nil {
+		test.Fatalf("Cannot decode hashByte: %v", err)
+	}
 
 	copy(consensusLeader.blockHash[:], hashBytes[:])
 
@@ -140,8 +146,14 @@ func TestProcessMessageValidatorPrepared(test *testing.T) {
 		test.Fatalf("Cannot craeate consensus: %v", err)
 	}
 	blockBytes, err := hex.DecodeString("f902a5f902a0a00000000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000a02b418211410ee3e75b32abd925bbeba215172afa509d65c1953d4b4e505a4a2aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808080a000000000000000000000000000000000000000000000000000000000000000008800000000000000008400000001b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000c0c0")
+	if err != nil {
+		test.Fatalf("Cannot decode blockByte: %v", err)
+	}
 	consensusLeader.block = blockBytes
 	hashBytes, err := hex.DecodeString("bdd66a8211ffcbf0ad431b506c854b49264951fd9f690928e9cf44910c381053")
+	if err != nil {
+		test.Fatalf("Cannot decode hashByte: %v", err)
+	}
 
 	copy(consensusLeader.blockHash[:], hashBytes[:])
 
@@ -216,8 +228,14 @@ func TestProcessMessageValidatorCommitted(test *testing.T) {
 		test.Fatalf("Cannot craeate consensus: %v", err)
 	}
 	blockBytes, err := hex.DecodeString("f902a5f902a0a00000000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000a02b418211410ee3e75b32abd925bbeba215172afa509d65c1953d4b4e505a4a2aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808080a000000000000000000000000000000000000000000000000000000000000000008800000000000000008400000001b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000c0c0")
+	if err != nil {
+		test.Fatalf("Cannot decode blockByte: %v", err)
+	}
 	consensusLeader.block = blockBytes
 	hashBytes, err := hex.DecodeString("bdd66a8211ffcbf0ad431b506c854b49264951fd9f690928e9cf44910c381053")
+	if err != nil {
+		test.Fatalf("Cannot decode hashByte: %v", err)
+	}
 
 	copy(consensusLeader.blockHash[:], hashBytes[:])
 

core/tx_journal.go

@@ -121,10 +121,7 @@ func (journal *txJournal) insert(tx *types.Transaction) error {
 	if journal.writer == nil {
 		return errNoActiveJournal
 	}
-	if err := rlp.Encode(journal.writer, tx); err != nil {
+	return rlp.Encode(journal.writer, tx)
-		return err
-	}
-	return nil
 }
 
 // rotate regenerates the transaction journal based on the current contents of

internal/utils/configfile_test.go

@@ -9,84 +9,84 @@ import (
 
 func TestReadWalletProfile(t *testing.T) {
 	config := []*WalletProfile{
-		&WalletProfile{
+		{
 			Profile:   "default",
 			Bootnodes: []string{"127.0.0.1:9000/abcd", "127.0.0.1:9999/daeg"},
 			Shards:    4,
 			RPCServer: [][]p2p.Peer{
-				[]p2p.Peer{
+				{
-					p2p.Peer{
+					{
 						IP:   "127.0.0.4",
 						Port: "8888",
 					},
-					p2p.Peer{
+					{
 						IP:   "192.168.0.4",
 						Port: "9876",
 					},
 				},
-				[]p2p.Peer{
+				{
-					p2p.Peer{
+					{
 						IP:   "127.0.0.1",
 						Port: "8888",
 					},
-					p2p.Peer{
+					{
 						IP:   "192.168.0.1",
 						Port: "9876",
 					},
 				},
-				[]p2p.Peer{
+				{
-					p2p.Peer{
+					{
 						IP:   "127.0.0.2",
 						Port: "8888",
 					},
-					p2p.Peer{
+					{
 						IP:   "192.168.0.2",
 						Port: "9876",
 					},
 				},
-				[]p2p.Peer{
+				{
-					p2p.Peer{
+					{
 						IP:   "127.0.0.3",
 						Port: "8888",
 					},
-					p2p.Peer{
+					{
 						IP:   "192.168.0.3",
 						Port: "9876",
 					},
 				},
 			},
 		},
-		&WalletProfile{
+		{
 			Profile:   "testnet",
 			Bootnodes: []string{"192.168.0.1:9990/abcd", "127.0.0.1:8888/daeg"},
 			Shards:    3,
 			RPCServer: [][]p2p.Peer{
-				[]p2p.Peer{
+				{
-					p2p.Peer{
+					{
 						IP:   "192.168.2.3",
 						Port: "8888",
 					},
-					p2p.Peer{
+					{
 						IP:   "192.168.192.3",
 						Port: "9877",
 					},
 				},
-				[]p2p.Peer{
+				{
-					p2p.Peer{
+					{
 						IP:   "192.168.2.1",
 						Port: "8888",
 					},
-					p2p.Peer{
+					{
 						IP:   "192.168.192.1",
 						Port: "9877",
 					},
 				},
-				[]p2p.Peer{
+				{
-					p2p.Peer{
+					{
 						IP:   "192.168.2.2",
 						Port: "8888",
 					},
-					p2p.Peer{
+					{
 						IP:   "192.168.192.2",
 						Port: "9877",
 					},

internal/utils/utils_test.go

@@ -179,17 +179,17 @@ func TestStringsToPeers(t *testing.T) {
 		{
 			"127.0.0.1:9000,192.168.192.1:8888,54.32.12.3:9898",
 			[]p2p.Peer{
-				p2p.Peer{IP: "127.0.0.1", Port: "9000"},
+				{IP: "127.0.0.1", Port: "9000"},
-				p2p.Peer{IP: "192.168.192.1", Port: "8888"},
+				{IP: "192.168.192.1", Port: "8888"},
-				p2p.Peer{IP: "54.32.12.3", Port: "9898"},
+				{IP: "54.32.12.3", Port: "9898"},
 			},
 		},
 		{
 			"a:b,xx:XX,hello:world",
 			[]p2p.Peer{
-				p2p.Peer{IP: "a", Port: "b"},
+				{IP: "a", Port: "b"},
-				p2p.Peer{IP: "xx", Port: "XX"},
+				{IP: "xx", Port: "XX"},
-				p2p.Peer{IP: "hello", Port: "world"},
+				{IP: "hello", Port: "world"},
 			},
 		},
 	}

node/contract.go

@@ -48,7 +48,7 @@ func (node *Node) generateDeployedStakingContractAddress(contractAddress common.
 	//Correct Way 1:
 	//node.SendTx(mycontracttx)
 	//receipts := node.worker.GetCurrentReceipts()
-	//deployedcontractaddress = recepits[len(receipts)-1].ContractAddress //get the address from the receipt
+	//deployedcontractaddress = receipts[len(receipts)-1].ContractAddress //get the address from the receipt
 
 	//Correct Way 2:
 	//nonce := GetNonce(contractAddress)
@@ -75,6 +75,11 @@ func (node *Node) QueryStakeInfo() *structs.StakeInfoReturnValue {
 
 	state, err := node.blockchain.State()
 
+	if err != nil {
+		utils.GetLogInstance().Error("Failed to get blockchain state", "error", err)
+		return nil
+	}
+
 	stakingContractAddress := crypto.CreateAddress(deployerAddress, uint64(0))
 	tx := types.NewTransaction(
 		state.GetNonce(deployerAddress),

node/demo_contract.go

@@ -130,6 +130,10 @@ func (node *Node) GetResult(priKey string) (players []string, balances []*big.In
 
 	demoContractAddress := node.DemoContractAddress
 	key, err := crypto.HexToECDSA(priKey)
+	if err != nil {
+		utils.GetLogInstance().Error("Failed to parse private key", "error", err)
+	}
+
 	nonce := node.GetNonceOfAddress(crypto.PubkeyToAddress(key.PublicKey))
 
 	tx := types.NewTransaction(

node/node_genesis.go

@@ -63,7 +63,7 @@ func (node *Node) GenesisBlockSetup(db ethdb.Database, shardID uint32, isArchiva
 }
 
 // CreateGenesisAllocWithTestingAddresses create the genesis block allocation that contains deterministically
-// generated testing addressess with tokens. This is mostly used for generated simulated transactions in txgen.
+// generated testing addresses with tokens. This is mostly used for generated simulated transactions in txgen.
 // TODO: Remove it later when moving to production.
 func (node *Node) CreateGenesisAllocWithTestingAddresses(numAddress int) core.GenesisAlloc {
 	rand.Seed(0)

node/node_newblock.go

@@ -58,7 +58,7 @@ func (node *Node) WaitForConsensusReady(readySignal chan struct{}, stopChan chan
 						node.Worker.CommitTransactions(selectedTxs)
 						block, err := node.Worker.Commit()
 						if err != nil {
-							utils.GetLogInstance().Debug("Failed commiting new block", "Error", err)
+							utils.GetLogInstance().Debug("Failed committing new block", "Error", err)
 						} else {
 							if node.Consensus.ShardID == 0 {
 								// add new shard state if it's epoch block

node/node_syncing.go

@@ -118,7 +118,7 @@ func (node *Node) InitSyncingServer() {
 
 // StartSyncingServer starts syncing server.
 func (node *Node) StartSyncingServer() {
-	utils.GetLogInstance().Info("support_sycning: StartSyncingServer")
+	utils.GetLogInstance().Info("support_syncing: StartSyncingServer")
 	if node.downloaderServer.GrpcServer == nil {
 		node.downloaderServer.Start(node.SelfPeer.IP, syncing.GetSyncingPort(node.SelfPeer.Port))
 	}

node/node_test.go

@@ -79,12 +79,12 @@ func TestAddPeers(t *testing.T) {
 	pubKey2 := pki.GetBLSPrivateKeyFromInt(444).GetPublicKey()
 
 	peers1 := []*p2p.Peer{
-		&p2p.Peer{
+		{
 			IP:              "127.0.0.1",
 			Port:            "8888",
 			ConsensusPubKey: pubKey1,
 		},
-		&p2p.Peer{
+		{
 			IP:              "127.0.0.1",
 			Port:            "9999",
 			ConsensusPubKey: pubKey2,
@@ -123,13 +123,13 @@ func TestAddBeaconPeer(t *testing.T) {
 	pubKey2 := bls2.RandPrivateKey().GetPublicKey()
 
 	peers1 := []*p2p.Peer{
-		&p2p.Peer{
+		{
 			IP:              "127.0.0.1",
 			Port:            "8888",
 			ConsensusPubKey: pubKey1,
 			PeerID:          "1234",
 		},
-		&p2p.Peer{
+		{
 			IP:              "127.0.0.1",
 			Port:            "9999",
 			ConsensusPubKey: pubKey2,

test/p2pchat/chat.go

@@ -136,12 +136,17 @@ func main() {
 	}
 
 	if err != nil {
-		fmt.Printf("pubsub error: %v", err)
+		fmt.Printf("pub error: %v", err)
 		panic(err)
 	}
 
 	sub, err := ps.Subscribe("pubsubtestchannel")
 
+	if err != nil {
+		fmt.Printf("sub error: %v", err)
+		panic(err)
+	}
+
 	go writePubsub(ps)
 	go readPubsub(sub)