From d618779be37e5251303f871d52b71ec90c0e01a4 Mon Sep 17 00:00:00 2001
From: "Alisher A. Khassanov" <a.khssnv@gmail.com>
Date: Mon, 11 Mar 2024 16:36:48 +0500
Subject: [PATCH 1/4] Add `IsRemoved` field to `Bucket` struct

---
 blockchain/pallets/ddccustomers.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockchain/pallets/ddccustomers.go b/blockchain/pallets/ddccustomers.go
index 8af576d..fff76e5 100644
--- a/blockchain/pallets/ddccustomers.go
+++ b/blockchain/pallets/ddccustomers.go
@@ -18,6 +18,7 @@ type Bucket struct {
 	OwnerId   types.AccountID
 	ClusterId ClusterId
 	IsPublic  types.Bool
+	IsRemoved types.Bool
 }
 
 type UnlockChunk struct {

From e90fc80894e8580907836cba1ff66d962239b6be Mon Sep 17 00:00:00 2001
From: "Alisher A. Khassanov" <a.khssnv@gmail.com>
Date: Mon, 11 Mar 2024 16:37:36 +0500
Subject: [PATCH 2/4] Add `BucketRemoved` event definition

---
 blockchain/pallets/ddccustomers.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/blockchain/pallets/ddccustomers.go b/blockchain/pallets/ddccustomers.go
index fff76e5..da48da2 100644
--- a/blockchain/pallets/ddccustomers.go
+++ b/blockchain/pallets/ddccustomers.go
@@ -62,6 +62,11 @@ type (
 		BucketId BucketId
 		Topics   []types.Hash
 	}
+	EventDdcCustomersBucketRemoved struct {
+		Phase    types.Phase
+		BucketId BucketId
+		Topics   []types.Hash
+	}
 )
 
 type DdcCustomersApi interface {

From 33d40c329343a6d2be512b2d23490d089f3deb5d Mon Sep 17 00:00:00 2001
From: "Alisher A. Khassanov" <a.khssnv@gmail.com>
Date: Mon, 11 Mar 2024 16:39:30 +0500
Subject: [PATCH 3/4] Add `BucketRemoved` event to the registry

---
 blockchain/pallets/events.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blockchain/pallets/events.go b/blockchain/pallets/events.go
index 4f666e9..92114a7 100644
--- a/blockchain/pallets/events.go
+++ b/blockchain/pallets/events.go
@@ -19,6 +19,7 @@ type Events struct {
 	DdcCustomers_Charged              []EventDdcCustomersCharged              //nolint:stylecheck,golint
 	DdcCustomers_BucketCreated        []EventDdcCustomersBucketCreated        //nolint:stylecheck,golint
 	DdcCustomers_BucketUpdated        []EventDdcCustomersBucketUpdated        //nolint:stylecheck,golint
+	DdcCustomers_BucketRemoved        []EventDdcCustomersBucketRemoved        //nolint:stylecheck,golint
 
 	DdcPayouts_BillingReportInitialized    []EventDdcPayoutsBillingReportInitialized    //nolint:stylecheck,golint
 	DdcPayouts_ChargingStarted             []EventDdcPayoutsChargingStarted             //nolint:stylecheck,golint

From 032c4fde54095378682877883482df43448c4527 Mon Sep 17 00:00:00 2001
From: "Alisher A. Khassanov" <a.khssnv@gmail.com>
Date: Mon, 11 Mar 2024 16:47:14 +0500
Subject: [PATCH 4/4] Remove redundant error checks

---
 blockchain/pallets/primitives.go | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/blockchain/pallets/primitives.go b/blockchain/pallets/primitives.go
index 6357bd8..ba17997 100644
--- a/blockchain/pallets/primitives.go
+++ b/blockchain/pallets/primitives.go
@@ -97,30 +97,23 @@ func (m *StorageNodeMode) Decode(decoder scale.Decoder) error {
 		return ErrUnknownVariant
 	}
 
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
 func (m StorageNodeMode) Encode(encoder scale.Encoder) error {
-	var err1, err2 error
+	var err error
 	if m.IsFull {
-		err1 = encoder.PushByte(1)
+		err = encoder.PushByte(1)
 	} else if m.IsStorage {
-		err1 = encoder.PushByte(2)
+		err = encoder.PushByte(2)
 	} else if m.IsCache {
-		err1 = encoder.PushByte(3)
+		err = encoder.PushByte(3)
 	} else {
 		return ErrUnknownVariant
 	}
 
-	if err1 != nil {
-		return err1
-	}
-	if err2 != nil {
-		return err2
+	if err != nil {
+		return err
 	}
 
 	return nil