Fix mapstructure decode send request

appditto · Jul 1, 2024 · e9a5849 · e9a5849
1 parent 2f97643
commit e9a5849
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/apps/server/controller/block_c.go b/apps/server/controller/block_c.go
@@ -99,7 +99,7 @@ func (hc *HttpController) HandleReceiveAllRequest(rawRequest *map[string]interfa
 func (hc *HttpController) HandleSendRequest(rawRequest *map[string]interface{}, w http.ResponseWriter, r *http.Request) {
 	var sendRequest requests.SendRequest
 	if err := mapstructure.Decode(rawRequest, &sendRequest); err != nil {
-		log.Errorf("Error unmarshalling receive request %s", err)
+		log.Errorf("Error unmarshalling send request %s", err)
 		ErrUnableToParseJson(w, r)
 		return
 	} else if sendRequest.Wallet == "" || sendRequest.Action == "" || sendRequest.Amount == "" || sendRequest.Destination == "" {
@@ -144,7 +144,7 @@ func (hc *HttpController) HandleSendRequest(rawRequest *map[string]interface{},
 func (hc *HttpController) HandleAccountRepresentativeSetRequest(rawRequest *map[string]interface{}, w http.ResponseWriter, r *http.Request) {
 	var changeRequest requests.AccountRepresentativeSetRequest
 	if err := mapstructure.Decode(rawRequest, &changeRequest); err != nil {
-		log.Errorf("Error unmarshalling receive request %s", err)
+		log.Errorf("Error unmarshalling representative set request %s", err)
 		ErrUnableToParseJson(w, r)
 		return
 	} else if changeRequest.Wallet == "" || changeRequest.Action == "" || changeRequest.Representative == "" {

diff --git a/apps/server/models/requests/send_request.go b/apps/server/models/requests/send_request.go
@@ -9,8 +9,8 @@ type SendRequest struct {
 	BaseRequest `mapstructure:",squash"`
 	Source      string          `json:"source" mapstructure:"source"`
 	Destination string          `json:"destination" mapstructure:"destination"`
-	Amount      string          `json:"-"` // Exclude from automatic unmarshalling
-	RawAmount   json.RawMessage `json:"amount" mapstructure:"amount"`
+	Amount      string          `json:"-" mapstructure:"amount"` // Exclude from automatic unmarshalling
+	RawAmount   json.RawMessage `json:"amount" mapstructure:"-"`
 	ID          *string         `json:"id,omitempty" mapstructure:"id,omitempty"`
 	Work        *string         `json:"work,omitempty" mapstructure:"work,omitempty"`
 }

diff --git a/kubernetes/banano/deployment.yaml b/kubernetes/banano/deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: pippin-banano
-        image: bananocoin/pippin:3.0.9
+        image: bananocoin/pippin:3.0.10
         imagePullPolicy: Always
         resources:
           requests:

diff --git a/kubernetes/nano/deployment.yaml b/kubernetes/nano/deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: pippin-nano
-        image: bananocoin/pippin:3.0.9
+        image: bananocoin/pippin:3.0.10
         imagePullPolicy: Always
         resources:
           requests:

diff --git a/kubernetes/wban/deployment.yaml b/kubernetes/wban/deployment.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: pippin-banano
-        image: bananocoin/pippin:3.0.9
+        image: bananocoin/pippin:3.0.10
         imagePullPolicy: Always
         resources:
           requests: