style: use KeyName instead of KeyringKeyname

Author: jcstein

README.md

@@ -20,7 +20,7 @@ go-da defines a generic Data Availability interface for modular blockchains.
 | `GetProofs`      | `ids []id, namespace Namespace`                     | `[]Proof`          |
 | `Commit`      | `blobs []Blob, namespace Namespace`                      | `[]Commitment`  |
 | `Validate`    | `ids []Blob, proofs []Proof, namespace Namespace`        | `[]bool`        |
-| `Submit`      | `blobs []Blob, gasPrice float64, namespace Namespace, keyringkeyname Keyringkeyname`    | `[]ID` |
+| `Submit`      | `blobs []Blob, gasPrice float64, namespace Namespace, keyName keyName`    | `[]ID` |
 
 NOTE: The `Namespace` parameter in the interface methods is optional and used
 only on DA layers that support the functionality, for example Celestia

da.go

@@ -36,9 +36,9 @@ type DA interface {
 // posted to, for DA layers supporting the functionality.
 type Namespace = []byte
 
-// Keyringkeyname is an optional parameter used to set the keyring keyname for
+// KeyName is an optional parameter used to set the keyring keyname for
 // the DA service.
-type Keyringkeyname = []byte
+type KeyName = []byte
 
 // Blob is the data submitted/received from DA interface.
 type Blob = []byte

proto/da/da.proto

@@ -108,10 +108,10 @@ message SubmitRequest {
         repeated Blob blobs = 1;
         double gas_price = 2;
         Namespace namespace = 3;
-        Keyringkeyname keyringkeyname = 4;
+        KeyName keyName = 4;
 }
 
-message Keyringkeyname {
+message KeyName {
     bytes value = 1;
 }
 

proxy/grpc/client.go

@@ -105,16 +105,16 @@ func (c *Client) Commit(ctx context.Context, blobs []da.Blob, namespace da.Names
 }
 
 // Submit submits the Blobs to Data Availability layer.
-func (c *Client) Submit(ctx context.Context, blobs []da.Blob, gasPrice float64, namespace da.Namespace, keyringkeyname *da.Keyringkeyname) ([]da.ID, error) {
+func (c *Client) Submit(ctx context.Context, blobs []da.Blob, gasPrice float64, namespace da.Namespace, keyName da.KeyName) ([]da.ID, error) {
 	req := &pbda.SubmitRequest{
 		Blobs:     blobsDA2PB(blobs),
 		GasPrice:  gasPrice,
 		Namespace: &pbda.Namespace{Value: namespace},
 		Namespace: &pbda.KeyName{Value: keyName},
 	}
 
-	if keyringkeyname != nil {
-		req.Keyringkeyname = &pbda.Keyringkeyname{Value: *keyringkeyname}
+	if keyName != nil {
+		req.KeyName = &pbda.KeyName{Value: *keyName}
 	}
 
 	resp, err := c.client.Submit(ctx, req)

proxy/grpc/server.go

@@ -69,9 +69,9 @@ func (p *proxySrv) GetProofs(ctx context.Context, request *pbda.GetProofsRequest
 func (p *proxySrv) Submit(ctx context.Context, request *pbda.SubmitRequest) (*pbda.SubmitResponse, error) {
 	blobs := blobsPB2DA(request.Blobs)
 
-	var keyringkeyname *da.Keyringkeyname
-	if request.Keyringkeyname != nil {
-		keyringkeyname = (*da.Keyringkeyname)(&request.Keyringkeyname.Value)
+	var keyName da.KeyName
+	if request.KeyName != nil {
+		keyName = (da.KeyName)(&request.KeyName.Value)
 	}
 
 	ids, err := p.target.Submit(ctx, blobs, request.GasPrice, request.Namespace.GetValue(), request.KeyName.GetValue())

proxy/jsonrpc/client.go

@@ -26,7 +26,7 @@ type API struct {
 		GetProofs   func(ctx context.Context, ids []da.ID, ns da.Namespace) ([]da.Proof, error)          `perm:"read"`
 		Commit      func(ctx context.Context, blobs []da.Blob, ns da.Namespace) ([]da.Commitment, error) `perm:"read"`
 		Validate    func(context.Context, []da.ID, []da.Proof, da.Namespace) ([]bool, error)             `perm:"read"`
-		Submit      func(context.Context, []da.Blob, float64, da.Namespace, *da.Keyringkeyname) ([]da.ID, error) `perm:"write"`
+		Submit      func(context.Context, []da.Blob, float64, da.Namespace, da.KeyName) ([]da.ID, error) `perm:"write"`
 	}
 }
 
@@ -61,8 +61,8 @@ func (api *API) Validate(ctx context.Context, ids []da.ID, proofs []da.Proof, ns
 }
 
 // Submit submits the Blobs to Data Availability layer.
-func (api *API) Submit(ctx context.Context, blobs []da.Blob, gasPrice float64, ns da.Namespace, keyringkeyname *da.Keyringkeyname) ([]da.ID, error) {
-	return api.Internal.Submit(ctx, blobs, gasPrice, ns, keyringkeyname)
+func (api *API) Submit(ctx context.Context, blobs []da.Blob, gasPrice float64, ns da.Namespace, keyName da.KeyName) ([]da.ID, error) {
+	return api.Internal.Submit(ctx, blobs, gasPrice, ns, keyName)
 }
 
 // Client is the jsonrpc client

test/dummy.go

@@ -122,7 +122,7 @@ func (d *DummyDA) Commit(ctx context.Context, blobs []da.Blob, _ da.Namespace) (
 }
 
 // Submit stores blobs in DA layer.
-func (d *DummyDA) Submit(ctx context.Context, blobs []da.Blob, gasPrice float64, _ da.Namespace, keyringkeyname *da.Keyringkeyname) ([]da.ID, error) {
+func (d *DummyDA) Submit(ctx context.Context, blobs []da.Blob, gasPrice float64, _ da.Namespace, keyName *da.KeyName) ([]da.ID, error) {
 	d.mu.Lock()
 	defer d.mu.Unlock()
 	ids := make([]da.ID, len(blobs))