Merge pull request #10 from ElrondNetwork/fix-windows

data-field-as-byte-array
multiversx · Jul 27, 2020 · ae3c9b8 · ae3c9b8
2 parents bf519a3 + 7b1b0f8
commit ae3c9b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/deps/uint256/uint256.h b/deps/uint256/uint256.h
@@ -67,4 +67,4 @@ bool tostring128(uint128_t *number, uint32_t base, char *out,
 bool tostring256(uint256_t *number, uint32_t base, char *out,
                  uint32_t outLength);
 
-#endif /* _UINT256_H_ */
+#endif /* _UINT256_H_ */
diff --git a/testApp/cmd/testApp/main.go b/testApp/cmd/testApp/main.go
@@ -75,7 +75,7 @@ type transaction struct {
 	SndAddr   string `json:"sender"`
 	GasPrice  uint64 `json:"gasPrice,omitempty"`
 	GasLimit  uint64 `json:"gasLimit,omitempty"`
-	Data      string `json:"data,omitempty"`
+	Data      []byte `json:"data,omitempty"`
 	Signature string `json:"signature,omitempty"`
 	ChainID   string `json:"chainID"`
 	Version   uint32 `json:"version"`
@@ -192,12 +192,7 @@ func getDeviceInfo(nanos *ledger.NanoS) error {
 
 // trim removes the trailing crlf characters from the end of a string
 func trim(s string) string {
-	if strings.HasSuffix(s, "\n") {
-		s = strings.TrimSuffix(s, "\n")
-	}
-	if strings.HasSuffix(s, "\r") {
-		s = strings.TrimSuffix(s, "\r")
-	}
+	s = strings.TrimRight(s, "\n\r")
 	return s
 }
 
@@ -357,7 +352,7 @@ func main() {
 	tx.Value = bigIntAmount.String()
 	tx.Nonce = nonce
 	tx.GasPrice = netConfig.Data.Config.MinGasPrice
-	tx.Data = data
+	tx.Data = []byte(data)
 	tx.GasLimit = netConfig.Data.Config.MinGasLimit + uint64(len(data))*netConfig.Data.Config.GasPerDataByte
 	tx.ChainID = netConfig.Data.Config.ChainID
 	tx.Version = netConfig.Data.Config.MinTransactionVersion