arrayify swapReceipt.secretHash

client/asset/eth/eth.go

@@ -569,7 +569,7 @@ func (eth *ExchangeWallet) unlockFunds(coins asset.Coins) error {
 // swapReceipt implements the asset.Receipt interface for ETH.
 type swapReceipt struct {
 	txHash     common.Hash
-	secretHash []byte
+	secretHash [dexeth.SecretHashSize]byte
 	// expiration and value can be determined with a blockchain
 	// lookup, but we cache these values to avoid this.
 	expiration time.Time
@@ -594,9 +594,7 @@ func (r *swapReceipt) Coin() asset.Coin {
 // Contract returns the swap's identifying data, which the concatenation of the
 // contract version and the secret hash.
 func (r *swapReceipt) Contract() dex.Bytes {
-	var secretHash [32]byte
-	copy(secretHash[:], r.secretHash)
-	return dexeth.EncodeContractData(r.ver, secretHash)
+	return dexeth.EncodeContractData(r.ver, r.secretHash)
 }
 
 // String returns a string representation of the swapReceipt.
@@ -653,12 +651,14 @@ func (eth *ExchangeWallet) Swap(swaps *asset.Swaps) ([]asset.Receipt, asset.Coin
 
 	txHash := tx.Hash()
 	for _, swap := range swaps.Contracts {
+		var secretHash [dexeth.SecretHashSize]byte
+		copy(secretHash[:], swap.SecretHash)
 		receipts = append(receipts,
 			&swapReceipt{
 				expiration: encode.UnixTimeMilli(int64(swap.LockTime)),
 				value:      swap.Value,
 				txHash:     txHash,
-				secretHash: swap.SecretHash,
+				secretHash: secretHash,
 				ver:        swaps.AssetVersion,
 			})
 	}

client/asset/eth/eth_test.go

@@ -950,7 +950,7 @@ func TestSwap(t *testing.T) {
 			if swaps.AssetVersion != ver {
 				t.Fatal("wrong contract version")
 			}
-			if !bytes.Equal(contractData[4:], secretHash[:]) {
+			if !bytes.Equal(contract.SecretHash, secretHash[:]) {
 				t.Fatalf("%v, contract: %x != secret hash in input: %x",
 					testName, receipt.Contract(), secretHash)
 			}