resloved merge conflicts

Cerebellum-Network · Aug 16, 2023 · cbc1ceb · cbc1ceb
1 parent fd478da
commit cbc1ceb
Showing 1 changed file with 0 additions and 27 deletions.
diff --git a/contract/pkg/bucket/messages.go b/contract/pkg/bucket/messages.go
@@ -9,7 +9,6 @@ import (
 )
 
 type (
-<<<<<<< HEAD
 	Balance       = types.U128
 	Cash          = Balance
 	Resource      = uint32
@@ -24,20 +23,6 @@ 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 (
@@ -61,11 +46,6 @@ type Cluster struct {
 	ResourcePerVNode Resource
 	ResourceUsed     Resource
 	Revenues         Cash
-<<<<<<< HEAD
-	Nodes            []NodeKey
-	VNodes           [][]Token
-=======
->>>>>>> 89ee068218673a072209b54361a5abe6528b51ff
 	TotalRent        Balance
 	CdnNodesKeys     []NodeKey
 	CdnRevenues      Cash
@@ -195,10 +175,6 @@ type ClusterParamsSetEvent struct {
 
 type ClusterRemovedEvent struct {
 	ClusterId ClusterId
-<<<<<<< HEAD
-=======
-	NodeKey   NodeKey
->>>>>>> 89ee068218673a072209b54361a5abe6528b51ff
 }
 
 type ClusterNodeStatusSetEvent struct {
@@ -210,10 +186,7 @@ type ClusterNodeStatusSetEvent struct {
 type ClusterNodeAddedEvent struct {
 	ClusterId ClusterId
 	NodeKey   NodeKey
-<<<<<<< HEAD
 	VNodes    VNodes
-=======
->>>>>>> 89ee068218673a072209b54361a5abe6528b51ff
 }
 
 type ClusterNodeRemovedEvent struct {