clean code, return an error

massalabs · Dec 18, 2023 · 56aad21 · 56aad21
1 parent 0c8ef07
commit 56aad21
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 25 deletions.
diff --git a/pkg/node/sendoperation/interfaces.go b/pkg/node/sendoperation/interfaces.go
@@ -16,13 +16,17 @@ type ReadOnlyCallParams struct {
 	CallerAddress  string        `json:"caller_address"`
 }
 
-// Read only call response (chatgpt4 generated).
-type ReadOnlyCallResponse struct {
-	JSONRPC string               `json:"jsonrpc"`
-	Result  []ReadOnlyCallResult `json:"result"`
+// ReadOnlyExecuteParams is the struct used to send a read only executeSC to the node.
+type ReadOnlyExecuteParams struct {
+	MaxGas             int           `json:"max_gas"`
+	Coins              string        `json:"coins"`
+	Fee                string        `json:"fee"`
+	Address            string        `json:"address"`
+	Bytecode           JSONableSlice `json:"bytecode"`
+	OperationDatastore JSONableSlice `json:"operation_datastore"`
 }
 
-type ReadOnlyCallResult struct {
+type ReadOnlyResult struct {
 	ExecutedAt   Timestamp   `json:"executed_at"`
 	Result       Result      `json:"result"`
 	OutputEvents []Event     `json:"output_events"`
@@ -67,7 +71,7 @@ func (r *Result) UnmarshalJSON(data []byte) error {
 		return nil
 	}
 
-	return nil // Or return an error if neither key is present
+	return nil
 }
 
 type Timestamp struct {
@@ -140,13 +144,3 @@ type BitVecHeadInfo struct {
 type DeferredCreditsInfo struct {
 	Credits map[string]interface{} `json:"credits"` // Empty in provided JSON, assumed to be a map
 }
-
-// ReadOnlyExecuteParams is the struct used to send a read only executeSC to the node.
-type ReadOnlyExecuteParams struct {
-	MaxGas             int           `json:"max_gas"`
-	Coins              string        `json:"coins"`
-	Fee                string        `json:"fee"`
-	Address            string        `json:"address"`
-	Bytecode           JSONableSlice `json:"bytecode"`
-	OperationDatastore JSONableSlice `json:"operation_datastore"`
-}
diff --git a/pkg/node/sendoperation/readonlycall.go b/pkg/node/sendoperation/readonlycall.go
@@ -63,7 +63,7 @@ func ReadOnlyCallSC(
 	fee string,
 	callerAddr string,
 	client *node.Client,
-) (*ReadOnlyCallResult, error) {
+) (*ReadOnlyResult, error) {
 	readOnlyCallParams := [][]ReadOnlyCallParams{
 		{
 			ReadOnlyCallParams{
@@ -95,7 +95,7 @@ func ReadOnlyCallSC(
 		)
 	}
 
-	var resp []ReadOnlyCallResult
+	var resp []ReadOnlyResult
 
 	err = rawResponse.GetObject(&resp)
 	if err != nil {
@@ -135,11 +135,7 @@ func EstimateGasCostExecuteSC(
 
 	result, err := ReadOnlyExecuteSC(contract, datastore, coinsString, feeString, acc.Address, client)
 	if err != nil {
-		logger.Warnf("ReadOnlyExecuteSC error: %s, caller address is %s", err, acc.Address)
-
-		// Do not return an error because execute_read_only_bytecode v24.1 fail with Internal error
-		// and on v27 fails with Invalid params
-		return DefaultGasLimitExecuteSC, nil
+		return 0, fmt.Errorf("ReadOnlyExecuteSC error: %w, caller address is %s", err, acc.Address)
 	}
 
 	estimatedGasCost := uint64(result.GasCost)
@@ -156,7 +152,7 @@ func ReadOnlyExecuteSC(
 	fee string,
 	callerAddr string,
 	client *node.Client,
-) (*ReadOnlyCallResult, error) {
+) (*ReadOnlyResult, error) {
 	if datastore == nil {
 		datastore = []byte{0}
 	}
@@ -191,7 +187,7 @@ func ReadOnlyExecuteSC(
 		)
 	}
 
-	var resp []ReadOnlyCallResult // rename if it's the same for call sc and execute sc: ReadOnlyResult
+	var resp []ReadOnlyResult
 
 	err = rawResponse.GetObject(&resp)
 	if err != nil {