recvg

pkg/jrpctest/testdata.go

@@ -40,9 +40,6 @@ func (td *TestData) AddTestData(name string, rd io.Reader) *TestData {
 		Name: name,
 	}
 	td.Files = append(td.Files, t)
-	currentPair := &TestPair{
-		Request: nil,
-	}
 	var (
 		arrowRight = []byte("-->")
 		arrowLeft  = []byte("<--")
@@ -58,23 +55,21 @@ func (td *TestData) AddTestData(name string, rd io.Reader) *TestData {
 			continue
 		}
 		if bytes.HasPrefix(txt, arrowRight) {
-			if currentPair.Request != nil {
-				t.Pairs = append(t.Pairs, currentPair)
-			}
-			currentPair = &TestPair{
-				Request: nil,
+			currentPair := &TestAction{
+				Direction: DirectionSend,
 			}
-			currentPair.Request = bytes.TrimSpace(bytes.TrimPrefix(txt, arrowRight))
+			currentPair.Data = bytes.TrimSpace(bytes.TrimPrefix(txt, arrowRight))
+			t.Action = append(t.Action, currentPair)
 			continue
 		}
 		if bytes.HasPrefix(txt, arrowLeft) {
-			xs := bytes.TrimSpace(bytes.TrimPrefix(txt, arrowLeft))
-			currentPair.Responses = append(currentPair.Responses, xs)
-			continue
+			currentPair := &TestAction{
+				Direction: DirectionRecv,
 			}
+			currentPair.Data = bytes.TrimSpace(bytes.TrimPrefix(txt, arrowLeft))
+			t.Action = append(t.Action, currentPair)
+			continue
 		}
-	if currentPair.Request != nil {
-		t.Pairs = append(t.Pairs, currentPair)
 	}
 	return nil
 }
@@ -85,10 +80,17 @@ type TestData struct {
 
 type TestFile struct {
 	Name   string
-	Pairs []*TestPair
+	Action []*TestAction
 }
 
-type TestPair struct {
-	Request   json.RawMessage
-	Responses []json.RawMessage
+type TestDirection string
+
+const (
+	DirectionSend = TestDirection("send")
+	DirectionRecv = TestDirection("recv")
+)
+
+type TestAction struct {
+	Direction TestDirection
+	Data      json.RawMessage
 }

pkg/jrpctest/testdata_test.go

@@ -12,11 +12,8 @@ func TestLoadTestData(t *testing.T) {
 	log.Println(jrpctest.OriginalTestData)
 	for _, file := range jrpctest.OriginalTestData.Files {
 		fmt.Printf("file %s:\n", file.Name)
-		for idx, pair := range file.Pairs {
-			fmt.Printf(" %d --> %s\n", idx, string(pair.Request))
-			for _, v := range pair.Responses {
-				fmt.Printf("   <-- %s\n", string(v))
-			}
+		for idx, pair := range file.Action {
+			fmt.Printf(" %d %s %s\n", idx, pair.Direction, string(pair.Data))
 		}
 	}
 }