From 92a48ed5a724b901bbda6749204254d0e5b899fa Mon Sep 17 00:00:00 2001 From: Preston Van Loon Date: Mon, 15 Jan 2018 16:46:33 -0500 Subject: [PATCH] remove collation type not part of this PR/branch Former-commit-id: 62179e39610ce42eae3f2e716c01be8a5dda1c42 [formerly cf4fe8cf7839f178f3d3d27da0b92fe1f83746a5] Former-commit-id: 8199f36a3b617a55c1fd0ad63b79223e095b0665 --- core/types/collation.go | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 core/types/collation.go diff --git a/core/types/collation.go b/core/types/collation.go deleted file mode 100644 index 9828c69e4..000000000 --- a/core/types/collation.go +++ /dev/null @@ -1,23 +0,0 @@ -package types - -import ( - "github.com/ethereum/go-ethereum/common" -) - -type Collation struct { - Header CollationHeader // Header metadata - TxList []Transaction // List of transaction in this collation -} - -type CollationHeader struct { - ShardID uint64 // Shard ID of the shard - ExpectedPeriodNumber uint64 // Expected number in which this collation expects to be included - PeriodStartPrevhash common.Hash // Hash of the last block before the expected period starts - ParentCollectionHash common.Hash // Hash of the parent collation - TxListRoot common.Hash // Root hash of the trie holding the transactions included in this collation - Coinbase common.Address // Address chose by the creater of the shard header - PostStateRoot common.Hash // New state root of the shard after this collation - ReceiptsRoot common.Hash // Root hash of the receipt trie - - // TODO: Add signature -}