ftx: fix null currency.Pair UnmarshalJSON (thrasher-corp#1049)

* fix ftx unmarshal * add tests * fix ineffectual assignment to err * Update currency/pair_test.go Co-authored-by: Adrian Gallagher <[email protected]> Co-authored-by: Adrian Gallagher <[email protected]>
MaoLiii · Sep 29, 2022 · 625020c · 625020c
1 parent 71a10b0
commit 625020c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/currency/pair_methods.go b/currency/pair_methods.go
@@ -34,6 +34,11 @@ func (p *Pair) UnmarshalJSON(d []byte) error {
 		return err
 	}
 
+	if pair == "" {
+		*p = EMPTYPAIR
+		return nil
+	}
+
 	newPair, err := NewPairFromString(pair)
 	if err != nil {
 		return err

diff --git a/currency/pair_test.go b/currency/pair_test.go
@@ -70,6 +70,22 @@ func TestPairUnmarshalJSON(t *testing.T) {
 		t.Errorf("Pairs UnmarshalJSON() error expected %s but received %s",
 			configPair, unmarshalHere)
 	}
+
+	encoded, err = json.Marshal(EMPTYPAIR)
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = json.Unmarshal(encoded, &unmarshalHere)
+	if err != nil {
+		t.Fatal("Pair UnmarshalJSON() error", err)
+	}
+	err = json.Unmarshal([]byte("null"), &unmarshalHere)
+	if err != nil {
+		t.Fatal("Pair UnmarshalJSON() error", err)
+	}
+	if unmarshalHere != EMPTYPAIR {
+		t.Fatalf("Expected EMPTYPAIR got: %s", unmarshalHere)
+	}
 }
 
 func TestPairMarshalJSON(t *testing.T) {