removed message field in retrieve blocks

vitwit · Aug 24, 2023 · 6ba5623 · 6ba5623
1 parent ce2ee0a
commit 6ba5623
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/da/avail/avail.go b/da/avail/avail.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"strings"
 
 	ds "github.com/ipfs/go-datastore"
 	"github.com/rollkit/rollkit/da"
@@ -111,6 +110,7 @@ func (c *DataAvailabilityLayerClient) RetrieveBlocks(ctx context.Context, dataLa
 
 	blocks := []*types.Block{}
 
+Loop:
 	blockNumber := dataLayerHeight
 
 	appDataURL := fmt.Sprintf(c.config.BaseURL+"/appdata/%d?decode=true", blockNumber)
@@ -139,13 +139,23 @@ func (c *DataAvailabilityLayerClient) RetrieveBlocks(ctx context.Context, dataLa
 	}
 
 	var appDataObject AppData
-	err = json.Unmarshal(responseData, &appDataObject)
-	if err != nil {
-		return da.ResultRetrieveBlocks{
-			BaseResult: da.BaseResult{
-				Code:    da.StatusError,
-				Message: err.Error(),
-			},
+	if string(responseData) == "\"Not found\"" {
+
+		appDataObject = AppData{Block: uint32(blockNumber), Extrinsics: []string{}}
+
+	} else if string(responseData) == "\"Processing block\"" {
+
+		goto Loop
+
+	} else {
+		err = json.Unmarshal(responseData, &appDataObject)
+		if err != nil {
+			return da.ResultRetrieveBlocks{
+				BaseResult: da.BaseResult{
+					Code:    da.StatusError,
+					Message: err.Error(),
+				},
+			}
 		}
 	}
 
@@ -176,7 +186,6 @@ func (c *DataAvailabilityLayerClient) RetrieveBlocks(ctx context.Context, dataLa
 		BaseResult: da.BaseResult{
 			Code:     da.StatusSuccess,
 			DAHeight: uint64(appDataObject.Block),
-			Message:  "block data: " + strings.Join(appDataObject.Extrinsics, " "),
 		},
 		Blocks: blocks,
 	}

diff --git a/da/avail/datasubmit/submitdata.go b/da/avail/datasubmit/submitdata.go
@@ -72,7 +72,7 @@ func SubmitData(apiURL string, seed string, appID int, data []byte) error {
 		TransactionVersion: rv.TransactionVersion,
 	}
 
-	// Sign the transaction using Alice's default account
+	// Sign the transaction
 	err = ext.Sign(keyringPair, signOptions)
 	if err != nil {
 		return err

diff --git a/go.mod b/go.mod
@@ -34,7 +34,6 @@ require (
 	golang.org/x/net v0.14.0
 	google.golang.org/grpc v1.56.1
 	google.golang.org/protobuf v1.31.0
-// github.com/chandiniv1/go-substrate-rpc-client/v4 dfd1152c8eca19e7090112c105770db21149e3cf
 )
 
 require (