Fix: atomex tezos storage

atomex-protocol · Sep 30, 2021 · 120f323 · 120f323
1 parent ec59293
commit 120f323
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/internal/chain/tezos/chain.go b/internal/chain/tezos/chain.go
@@ -394,7 +394,7 @@ func (t *Tezos) parseContractValueUpdate(bigMapUpdate BigMapUpdate) error {
 
 	switch bigMapUpdate.Action {
 	case BigMapActionAddKey:
-		refundTime, err := time.Parse(time.RFC3339, value.Settings.RefundTime)
+		refundTime, err := time.Parse(time.RFC3339, value.RefundTime)
 		if err != nil {
 			return err
 		}
@@ -405,20 +405,20 @@ func (t *Tezos) parseContractValueUpdate(bigMapUpdate BigMapUpdate) error {
 				Chain:        chain.ChainTypeTezos,
 				Contract:     bigMapUpdate.Contract.Address,
 			},
-			Initiator:   value.Recipients.Initiator,
-			Participant: value.Recipients.Participant,
+			Initiator:   value.Initiator,
+			Participant: value.Participant,
 			RefundTime:  refundTime,
 		}
 
-		if err := event.SetPayOff(value.Settings.Payoff, t.minPayoff); err != nil {
+		if err := event.SetPayOff(value.Payoff, t.minPayoff); err != nil {
 			if errors.Is(err, chain.ErrMinPayoff) {
 				log.Warn().Str("hashed_secret", event.HashedSecret.String()).Msg("skip because of small pay off")
 				return nil
 			}
 			return err
 		}
 
-		if err := event.SetAmountFromString(value.Settings.Amount); err != nil {
+		if err := event.SetAmountFromString(value.Amount); err != nil {
 			return err
 		}
 
@@ -576,7 +576,7 @@ func (t *Tezos) parseContractValueKeys(key api.BigMapKey, contract string) error
 		return err
 	}
 
-	refundTime, err := time.Parse(time.RFC3339, value.Settings.RefundTime)
+	refundTime, err := time.Parse(time.RFC3339, value.RefundTime)
 	if err != nil {
 		return err
 	}
@@ -587,20 +587,20 @@ func (t *Tezos) parseContractValueKeys(key api.BigMapKey, contract string) error
 			Chain:        chain.ChainTypeTezos,
 			Contract:     contract,
 		},
-		Initiator:   value.Recipients.Initiator,
-		Participant: value.Recipients.Participant,
+		Initiator:   value.Initiator,
+		Participant: value.Participant,
 		RefundTime:  refundTime,
 	}
 
-	if err := event.SetPayOff(value.Settings.Payoff, t.minPayoff); err != nil {
+	if err := event.SetPayOff(value.Payoff, t.minPayoff); err != nil {
 		if errors.Is(err, chain.ErrMinPayoff) {
 			log.Warn().Str("hashed_secret", event.HashedSecret.String()).Msg("skip because of small pay off")
 			return nil
 		}
 		return err
 	}
 
-	if err := event.SetAmountFromString(value.Settings.Amount); err != nil {
+	if err := event.SetAmountFromString(value.Amount); err != nil {
 		return err
 	}
 

diff --git a/internal/chain/tezos/data.go b/internal/chain/tezos/data.go
@@ -31,15 +31,11 @@ const (
 
 // AtomexValue -
 type AtomexValue struct {
-	Settings struct {
-		Amount     string `json:"amount" mapstructure:"amount"`
-		Payoff     string `json:"payoff" mapstructure:"payoff"`
-		RefundTime string `json:"refund_time" mapstructure:"refund_time"`
-	} `json:"settings" mapstructure:"settings"`
-	Recipients struct {
-		Initiator   string `json:"initiator" mapstructure:"initiator"`
-		Participant string `json:"participant" mapstructure:"participant"`
-	} `json:"recipients" mapstructure:"recipients"`
+	Amount      string `json:"amount" mapstructure:"amount"`
+	Payoff      string `json:"payoff" mapstructure:"payoff"`
+	RefundTime  string `json:"refund_time" mapstructure:"refund_time"`
+	Initiator   string `json:"initiator" mapstructure:"initiator"`
+	Participant string `json:"participant" mapstructure:"participant"`
 }
 
 // AtomexTokenValue -