gadget: remove LaidOutVolume.Size

As it was not used anymore. 

2 files changed, 1 insertions, 23 deletions

diff --git a/gadget/layout.go b/gadget/layout.go
index b8f4270834..3700a89989 100644
--- a/gadget/layout.go
+++ b/gadget/layout.go
@@ -58,8 +58,6 @@ const NonMBRStartOffset = 1 * quantity.OffsetMiB
 // structures within it
 type LaidOutVolume struct {
	*Volume
-	// Size is the total size of the volume
-	Size quantity.Size
	// LaidOutStructure is a list of structures within the volume, sorted
	// by their start offsets
	LaidOutStructure []LaidOutStructure
@@ -280,12 +278,7 @@ func LayoutVolume(volume *Volume, opts *LayoutOptions) (*LaidOutVolume, error) {
	return nil, err
	}
 
-	farthestEnd := quantity.Offset(0)
-	for idx, ps := range structures {
-	if end := ps.StartOffset + quantity.Offset(ps.VolumeStructure.Size); end > farthestEnd {
-	farthestEnd = end
-	}
-
+	for idx := range structures {
	// Set appropriately label and type details
	// TODO: set this in layoutVolumeStructures in the future.
	setOnDiskLabelAndTypeInLaidOuts(structures, opts.EncType)
@@ -314,7 +307,6 @@ func LayoutVolume(volume *Volume, opts *LayoutOptions) (*LaidOutVolume, error) {
 
	vol := &LaidOutVolume{
	Volume: volume,
-	Size: quantity.Size(farthestEnd),
	LaidOutStructure: structures,
	}
	return vol, nil
diff --git a/gadget/layout_test.go b/gadget/layout_test.go
index 8e5a990b7a..1e6f49bcea 100644
--- a/gadget/layout_test.go
+++ b/gadget/layout_test.go
@@ -62,7 +62,6 @@ func (p *layoutTestSuite) TestVolumeSize(c *C) {
	{Offset: asOffsetPtr(quantity.OffsetMiB), Size: 2 * quantity.SizeMiB},
	},
	},
-	Size: 3 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{{
	OnDiskStructure: gadget.OnDiskStructure{
	Size: 2 * quantity.SizeMiB,
@@ -105,7 +104,6 @@ volumes:
 
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 501 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -166,7 +164,6 @@ volumes:
	}
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 502 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -226,7 +223,6 @@ volumes:
 
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 1101 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -294,7 +290,6 @@ volumes:
 
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 1300 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -361,7 +356,6 @@ volumes:
 
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 1200 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -447,7 +441,6 @@ volumes:
	c.Assert(err, IsNil)
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 1200 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -629,7 +622,6 @@ volumes:
	c.Assert(err, IsNil)
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 3 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -684,7 +676,6 @@ volumes:
	c.Assert(err, IsNil)
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 3 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -736,7 +727,6 @@ volumes:
	c.Assert(err, IsNil)
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 3 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -782,7 +772,6 @@ volumes:
	c.Assert(err, IsNil)
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 3 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{
@@ -829,7 +818,6 @@ volumes:
	c.Assert(err, IsNil)
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 2 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	// MBR
@@ -889,7 +877,6 @@ volumes:
	c.Assert(err, IsNil)
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: vol,
-	Size: 3 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	// mbr
@@ -1411,7 +1398,6 @@ func (p *layoutTestSuite) TestLayoutWithMinSize(c *C) {
	// Check StartOffset and Size is well defined even if using min-size
	c.Assert(v, DeepEquals, &gadget.LaidOutVolume{
	Volume: &vol,
-	Size: 5 * quantity.SizeMiB,
	LaidOutStructure: []gadget.LaidOutStructure{
	{
	OnDiskStructure: gadget.OnDiskStructure{