[mainnet-release] Address code comments

core/types/block.go

@@ -183,11 +183,10 @@ func init() {
 
 // Block represents an entire block in the Harmony blockchain.
 type Block struct {
-	header              *block.Header
-	uncles              []*block.Header
-	transactions        Transactions
-	stakingTransactions staking.StakingTransactions
-	incomingReceipts    CXReceiptsProofs
+	header           *block.Header
+	uncles           []*block.Header
+	transactions     Transactions
+	incomingReceipts CXReceiptsProofs
 
 	// caches
 	hash atomic.Value
@@ -350,7 +349,7 @@ func (b *Block) Transactions() Transactions {
 
 // StakingTransactions returns stakingTransactions.
 func (b *Block) StakingTransactions() staking.StakingTransactions {
-	return b.stakingTransactions
+	return staking.StakingTransactions{}
 }
 
 // IncomingReceipts returns verified outgoing receipts

shard/shard_state.go

@@ -100,7 +100,7 @@ func CompareBlsPublicKey(k1, k2 BlsPublicKey) int {
 	return bytes.Compare(k1[:], k2[:])
 }
 
-// NodeID represents node id (BLS address) and its voting power, which is set at epoch change only.
+// NodeID represents node id (BLS address)
 type NodeID struct {
 	EcdsaAddress common.Address `json:"ecdsa_address"`
 	BlsPublicKey BlsPublicKey   `json:"bls_pubkey"`

staking/types/validator.go

@@ -33,7 +33,7 @@ type Validator struct {
 	// description for the validator
 	Description `json:"description" yaml:"description"`
 	// Is the validator active in the validating process or not
-	IsCurrentlyActive bool `json:"active" yaml:"active"`
+	Active bool `json:"active" yaml:"active"`
 }
 
 // Description - some possible IRL connections