Move v1 Header and friends into block/v1

block/header.go

@@ -5,8 +5,16 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+
+	v1 "github.com/harmony-one/harmony/block/v1"
 )
 
+// Header represents a block header in the Harmony blockchain.
+type Header = v1.Header
+
+// NewHeader creates a new header object
+var NewHeader = v1.NewHeader
+
 // HeaderFieldSetter is a header field setter.
 //
 // See NewHeaderWith for how it is used.

block/v1/gen_header_json.go

@@ -1,6 +1,6 @@
 // Code generated by github.com/fjl/gencodec. DO NOT EDIT.
 
-package block
+package v1
 
 import (
 	"encoding/json"

block/v1/header.go

@@ -1,4 +1,4 @@
-package block
+package v1
 
 import (
 	"io"
@@ -15,7 +15,7 @@ import (
 	"github.com/harmony-one/harmony/shard"
 )
 
-// Header represents a block header in the Harmony blockchain.
+// Header is the V1 block header.
 type Header struct {
 	fields headerFields
 }
@@ -408,4 +408,3 @@ func (h *Header) GetShardState() (shard.State, error) {
 	}
 	return shardState, nil
 }
-