resolved merge conflicts

Cerebellum-Network · Aug 16, 2023 · fd478da · fd478da
2 parents 0b30365 + 89ee068
commit fd478da
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/contract/pkg/bucket/messages.go b/contract/pkg/bucket/messages.go
@@ -9,6 +9,7 @@ import (
 )
 
 type (
+<<<<<<< HEAD
 	Balance       = types.U128
 	Cash          = Balance
 	Resource      = uint32
@@ -23,6 +24,20 @@ type (
 	NodeState     = byte
 	NodeKey       = string
 	VNodes        = [][]Token
+=======
+	Balance      = types.U128
+	Cash         = Balance
+	Resource     = uint32
+	NodeKey      = string
+	Token        = uint64
+	ClusterId    = uint32
+	AccountId    = types.AccountID
+	ProviderId   = AccountId
+	BucketId     = uint32
+	Params       = string
+	BucketParams = Params
+	NodeState    = byte
+>>>>>>> 89ee068218673a072209b54361a5abe6528b51ff
 )
 
 const (
@@ -46,8 +61,11 @@ type Cluster struct {
 	ResourcePerVNode Resource
 	ResourceUsed     Resource
 	Revenues         Cash
+<<<<<<< HEAD
 	Nodes            []NodeKey
 	VNodes           [][]Token
+=======
+>>>>>>> 89ee068218673a072209b54361a5abe6528b51ff
 	TotalRent        Balance
 	CdnNodesKeys     []NodeKey
 	CdnRevenues      Cash
@@ -177,6 +195,10 @@ type ClusterParamsSetEvent struct {
 
 type ClusterRemovedEvent struct {
 	ClusterId ClusterId
+<<<<<<< HEAD
+=======
+	NodeKey   NodeKey
+>>>>>>> 89ee068218673a072209b54361a5abe6528b51ff
 }
 
 type ClusterNodeStatusSetEvent struct {
@@ -188,7 +210,10 @@ type ClusterNodeStatusSetEvent struct {
 type ClusterNodeAddedEvent struct {
 	ClusterId ClusterId
 	NodeKey   NodeKey
+<<<<<<< HEAD
 	VNodes    VNodes
+=======
+>>>>>>> 89ee068218673a072209b54361a5abe6528b51ff
 }
 
 type ClusterNodeRemovedEvent struct {