From ec81bb24ad07e38e263ae0f632405295f02abd6a Mon Sep 17 00:00:00 2001
From: Bel LaPointe <breel@qualtrics.com>
Date: Tue, 16 Mar 2021 22:42:28 -0500
Subject: [PATCH] remove unused discard

---
 src/entity/deck.go                    | 17 +----------------
 src/game/rule/operation/phase_test.go |  6 +-----
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/entity/deck.go b/src/entity/deck.go
index 24b9108..ded1516 100644
--- a/src/entity/deck.go
+++ b/src/entity/deck.go
@@ -3,8 +3,7 @@ package entity
 import "math/rand"
 
 type Deck struct {
-	Deck    []Card
-	Discard []Card
+	Deck []Card
 }
 
 func (d *Deck) Shuffle() {
@@ -12,9 +11,6 @@ func (d *Deck) Shuffle() {
 }
 
 func (d *Deck) Draw() Card {
-	if len(d.Deck) == 0 {
-		d.ShuffleInDiscard()
-	}
 	if len(d.Deck) == 0 {
 		panic("cannot draw from an empty deck")
 	}
@@ -23,17 +19,6 @@ func (d *Deck) Draw() Card {
 	return card
 }
 
-func (d *Deck) ShuffleInDiscard() {
-	if len(d.Discard) == 0 {
-		return
-	}
-	for i := range d.Discard {
-		d.Deck = append(d.Deck, d.Discard[i])
-	}
-	d.Discard = d.Discard[:0]
-	shuffle(d.Deck)
-}
-
 func shuffle(cards []Card) {
 	if len(cards) == 0 {
 		return
diff --git a/src/game/rule/operation/phase_test.go b/src/game/rule/operation/phase_test.go
index f5052fd..b302c4f 100644
--- a/src/game/rule/operation/phase_test.go
+++ b/src/game/rule/operation/phase_test.go
@@ -150,18 +150,14 @@ func TestDeal(t *testing.T) {
 
 func newDeck() entity.Deck {
 	deck := make([]entity.Card, 0, 26)
-	discard := make([]entity.Card, 0, 26)
 	for i := 0; i < 52; i++ {
 		card := entity.Card{Suit: i % 4, Value: i % 13}
 		if i%2 == 1 {
 			deck = append(deck, card)
-		} else {
-			discard = append(discard, card)
 		}
 	}
 	return entity.Deck{
-		Deck:    deck,
-		Discard: discard,
+		Deck: deck,
 	}
 }