fix: remove logo from funder

KYVENetwork · Oct 10, 2023 · 64d85e6 · 64d85e6
1 parent 139b518
commit 64d85e6
Show file tree

Hide file tree

Showing 18 changed files with 213 additions and 562 deletions.
diff --git a/docs/swagger.yml b/docs/swagger.yml
@@ -7744,9 +7744,6 @@ paths:
                   identity:
                     type: string
                     title: identity is the 64 bit keybase.io identity string
-                  logo:
-                    type: string
-                    description: logo ...
                   website:
                     type: string
                     description: website ...
@@ -8038,9 +8035,6 @@ paths:
                     identity:
                       type: string
                       title: identity is the 64 bit keybase.io identity string
-                    logo:
-                      type: string
-                      description: logo ...
                     website:
                       type: string
                       description: website ...

diff --git a/proto/kyve/funders/v1beta1/events.proto b/proto/kyve/funders/v1beta1/events.proto
@@ -16,14 +16,12 @@ message EventCreateFunder {
   string moniker = 2;
   // identity is the 64 bit keybase.io identity string
   string identity = 3;
-  // logo ...
-  string logo = 4;
   // website ...
-  string website = 5;
+  string website = 4;
   // contact ...
-  string contact = 6;
+  string contact = 5;
   // description are some additional notes the funder finds important
-  string description = 7;
+  string description = 6;
 }
 
 // EventUpdateFunder is an event emitted when a funder is created.
@@ -35,14 +33,12 @@ message EventUpdateFunder {
   string moniker = 2;
   // identity is the 64 bit keybase.io identity string
   string identity = 3;
-  // logo ...
-  string logo = 4;
   // website ...
-  string website = 5;
+  string website = 4;
   // contact ...
-  string contact = 6;
+  string contact = 5;
   // description are some additional notes the funder finds important
-  string description = 7;
+  string description = 6;
 }
 
 // EventFundPool is an event emitted when a pool is funded.

diff --git a/proto/kyve/funders/v1beta1/funders.proto b/proto/kyve/funders/v1beta1/funders.proto
@@ -14,14 +14,12 @@ message Funder {
   string moniker = 2;
   // identity is the 64 bit keybase.io identity string
   string identity = 3;
-  // logo ...
-  string logo = 4;
   // website ...
-  string website = 5;
+  string website = 4;
   // contact ...
-  string contact = 6;
+  string contact = 5;
   // description are some additional notes the funder finds important
-  string description = 7;
+  string description = 6;
 }
 
 // Funding is the object which holds info about the current funding

diff --git a/proto/kyve/funders/v1beta1/tx.proto b/proto/kyve/funders/v1beta1/tx.proto
@@ -24,14 +24,12 @@ message MsgCreateFunder {
   string moniker = 2;
   // identity is the 64 bit keybase.io identity string
   string identity = 3;
-  // logo
-  string logo = 4;
   // website
-  string website = 5;
+  string website = 4;
   // contact
-  string contact = 6;
+  string contact = 5;
   // description are some additional notes the funder finds important
-  string description = 7;
+  string description = 6;
 }
 
 // MsgCreateFunderResponse defines the Msg/CreateFunder response type.
@@ -45,14 +43,12 @@ message MsgUpdateFunder {
   string moniker = 2;
   // identity is the 64 bit keybase.io identity string
   string identity = 3;
-  // logo
-  string logo = 4;
   // website
-  string website = 5;
+  string website = 4;
   // contact
-  string contact = 6;
+  string contact = 5;
   // description are some additional notes the funder finds important
-  string description = 7;
+  string description = 6;
 }
 
 // MsgUpdateFunderResponse defines the Msg/UpdateFunder response type.

diff --git a/proto/kyve/query/v1beta1/funders.proto b/proto/kyve/query/v1beta1/funders.proto
@@ -32,14 +32,12 @@ message Funder {
   string moniker = 2;
   // identity is the 64 bit keybase.io identity string
   string identity = 3;
-  // logo ...
-  string logo = 4;
   // website ...
-  string website = 5;
+  string website = 4;
   // contact ...
-  string contact = 6;
+  string contact = 5;
   // description ...
-  string description = 7;
+  string description = 6;
 }
 
 // FunderStats ...

diff --git a/proto/kyve/query/v1beta1/params.proto b/proto/kyve/query/v1beta1/params.proto
@@ -6,10 +6,10 @@ import "cosmos/gov/v1/gov.proto";
 import "google/api/annotations.proto";
 import "kyve/bundles/v1beta1/params.proto";
 import "kyve/delegation/v1beta1/params.proto";
+import "kyve/funders/v1beta1/params.proto";
 import "kyve/global/v1beta1/global.proto";
 import "kyve/pool/v1beta1/params.proto";
 import "kyve/stakers/v1beta1/params.proto";
-import "kyve/funders/v1beta1/params.proto";
 
 option go_package = "github.com/KYVENetwork/chain/x/query/types";
 

diff --git a/x/funders/client/cli/flags.go b/x/funders/client/cli/flags.go
@@ -7,7 +7,6 @@ import (
 const (
 	FlagMoniker     = "moniker"
 	FlagIdentity    = "identity"
-	FlagLogo        = "logo"
 	FlagWebsite     = "website"
 	FlagContact     = "contact"
 	FlagDescription = "description"
@@ -18,7 +17,6 @@ func flagSetFunderCreate() *flag.FlagSet {
 
 	fs.String(FlagMoniker, "", "The funder's name")
 	fs.String(FlagIdentity, "", "The optional identity signature (ex. UPort or Keybase)")
-	fs.String(FlagLogo, "", "The funder's (optional) logo")
 	fs.String(FlagWebsite, "", "The funder's (optional) website")
 	fs.String(FlagContact, "", "The funder's (optional) security contact email")
 	fs.String(FlagDescription, "", "The funder's (optional) description")

diff --git a/x/funders/client/cli/tx_create_funder.go b/x/funders/client/cli/tx_create_funder.go
@@ -15,10 +15,7 @@ func CmdCreateFunder() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			argMoniker := args[0]
-
-			// moniker, _ := cmd.Flags().GetString(FlagEditMoniker)
 			identity, _ := cmd.Flags().GetString(FlagIdentity)
-			logo, _ := cmd.Flags().GetString(FlagLogo)
 			website, _ := cmd.Flags().GetString(FlagWebsite)
 			contact, _ := cmd.Flags().GetString(FlagContact)
 			description, _ := cmd.Flags().GetString(FlagDescription)
@@ -32,7 +29,6 @@ func CmdCreateFunder() *cobra.Command {
 				Creator:     clientCtx.GetFromAddress().String(),
 				Moniker:     argMoniker,
 				Identity:    identity,
-				Logo:        logo,
 				Website:     website,
 				Contact:     contact,
 				Description: description,

diff --git a/x/funders/client/cli/tx_update_funder.go b/x/funders/client/cli/tx_update_funder.go
@@ -15,7 +15,6 @@ func CmdUpdateFunder() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			moniker, _ := cmd.Flags().GetString(FlagMoniker)
 			identity, _ := cmd.Flags().GetString(FlagIdentity)
-			logo, _ := cmd.Flags().GetString(FlagLogo)
 			website, _ := cmd.Flags().GetString(FlagWebsite)
 			contact, _ := cmd.Flags().GetString(FlagContact)
 			description, _ := cmd.Flags().GetString(FlagDescription)
@@ -29,7 +28,6 @@ func CmdUpdateFunder() *cobra.Command {
 				Creator:     clientCtx.GetFromAddress().String(),
 				Moniker:     moniker,
 				Identity:    identity,
-				Logo:        logo,
 				Website:     website,
 				Contact:     contact,
 				Description: description,

diff --git a/x/funders/keeper/msg_server_create_funder.go b/x/funders/keeper/msg_server_create_funder.go
@@ -25,7 +25,6 @@ func (k msgServer) CreateFunder(goCtx context.Context, msg *types.MsgCreateFunde
 		Address:     msg.Creator,
 		Moniker:     msg.Moniker,
 		Identity:    msg.Identity,
-		Logo:        msg.Logo,
 		Website:     msg.Website,
 		Contact:     msg.Contact,
 		Description: msg.Description,
@@ -36,7 +35,6 @@ func (k msgServer) CreateFunder(goCtx context.Context, msg *types.MsgCreateFunde
 		Address:     msg.Creator,
 		Moniker:     msg.Moniker,
 		Identity:    msg.Identity,
-		Logo:        msg.Logo,
 		Website:     msg.Website,
 		Contact:     msg.Contact,
 		Description: msg.Description,

diff --git a/x/funders/keeper/msg_server_create_funder_test.go b/x/funders/keeper/msg_server_create_funder_test.go
@@ -52,20 +52,18 @@ var _ = Describe("msg_server_create_funder.go", Ordered, func() {
 		Expect(funder.Address).To(Equal(i.ALICE))
 		Expect(funder.Moniker).To(Equal("moniker"))
 		Expect(funder.Identity).To(BeEmpty())
-		Expect(funder.Logo).To(BeEmpty())
 		Expect(funder.Website).To(BeEmpty())
 		Expect(funder.Contact).To(BeEmpty())
 		Expect(funder.Description).To(BeEmpty())
 	})
 
 	It("Create a funder with all values set", func() {
 		// ACT
-		moniker, identity, logo, website, contact, description := "moniker", "identity", "logo", "website", "contact", "description"
+		moniker, identity, website, contact, description := "moniker", "identity", "website", "contact", "description"
 		s.RunTxFundersSuccess(&types.MsgCreateFunder{
 			Creator:     i.ALICE,
 			Moniker:     moniker,
 			Identity:    identity,
-			Logo:        logo,
 			Website:     website,
 			Contact:     contact,
 			Description: description,
@@ -77,7 +75,6 @@ var _ = Describe("msg_server_create_funder.go", Ordered, func() {
 		Expect(funder.Address).To(Equal(i.ALICE))
 		Expect(funder.Moniker).To(Equal(moniker))
 		Expect(funder.Identity).To(Equal(identity))
-		Expect(funder.Logo).To(Equal(logo))
 		Expect(funder.Website).To(Equal(website))
 		Expect(funder.Contact).To(Equal(contact))
 		Expect(funder.Description).To(Equal(description))

diff --git a/x/funders/keeper/msg_server_update_funder.go b/x/funders/keeper/msg_server_update_funder.go
@@ -23,7 +23,6 @@ func (k msgServer) UpdateFunder(goCtx context.Context, msg *types.MsgUpdateFunde
 		Address:     msg.Creator,
 		Moniker:     msg.Moniker,
 		Identity:    msg.Identity,
-		Logo:        msg.Logo,
 		Website:     msg.Website,
 		Contact:     msg.Contact,
 		Description: msg.Description,
@@ -34,7 +33,6 @@ func (k msgServer) UpdateFunder(goCtx context.Context, msg *types.MsgUpdateFunde
 		Address:     msg.Creator,
 		Moniker:     msg.Moniker,
 		Identity:    msg.Identity,
-		Logo:        msg.Logo,
 		Website:     msg.Website,
 		Contact:     msg.Contact,
 		Description: msg.Description,