Merge pull request #41 from FastLane-Labs/misc-adjustments

Misc adjustments

core/server.go

@@ -146,8 +146,13 @@ func (br *BundleRequest) Marshal() []byte {
 
 type BundleResponse struct {
 	Id     string      `json:"id" validate:"required"`
-	Result common.Hash `json:"result"`
-	Error  string      `json:"error"`
+	Result common.Hash `json:"result,omitempty"`
+	Error  string      `json:"error,omitempty"`
+}
+
+func (br *BundleResponse) Marshal() []byte {
+	b, _ := json.Marshal(br)
+	return b
 }
 
 type Marshaler interface {

tests/utils.go

@@ -2,9 +2,9 @@ package tests
 
 import (
 	"crypto/ecdsa"
-	"fmt"
 
 	"github.com/FastLane-Labs/atlas-operations-relay/contract/atlas"
+	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )
@@ -24,12 +24,7 @@ func executionEnvironment(user common.Address, dAppControl common.Address) commo
 }
 
 func signMessage(data []byte, privKey *ecdsa.PrivateKey) ([]byte, error) {
-	prefix := fmt.Sprintf("\x19Ethereum Signed Message:\n%d", len(data))
-	prefixedData := []byte(prefix + string(data))
-
-	hash := crypto.Keccak256Hash(prefixedData)
-
-	signature, err := crypto.Sign(hash.Bytes(), privKey)
+	signature, err := crypto.Sign(accounts.TextHash(data), privKey)
 	if err != nil {
 		return nil, err
 	}