@@ -33,7 +33,7 @@ func TestHeaders(t *testing.T) {
33
33
cb , err := cid .Decode (c )
34
34
require .NoError (t , err )
35
35
36
- router .On ("FindProviders" , mock .Anything , cb ).
36
+ router .On ("FindProviders" , mock .Anything , cb , false ).
37
37
Return (results , nil )
38
38
39
39
resp , err := http .Get (serverAddr + ProvidePath + c )
@@ -63,7 +63,7 @@ func TestResponse(t *testing.T) {
63
63
cid , err := cid .Decode (cidStr )
64
64
require .NoError (t , err )
65
65
66
- runTest := func (t * testing.T , contentType string , expected string ) {
66
+ runTest := func (t * testing.T , contentType string , expectedStream bool , expectedBody string ) {
67
67
t .Parallel ()
68
68
69
69
results := iter .FromSlice ([]iter.Result [types.ProviderResponse ]{
@@ -85,7 +85,7 @@ func TestResponse(t *testing.T) {
85
85
server := httptest .NewServer (Handler (router ))
86
86
t .Cleanup (server .Close )
87
87
serverAddr := "http://" + server .Listener .Addr ().String ()
88
- router .On ("FindProviders" , mock .Anything , cid ).Return (results , nil )
88
+ router .On ("FindProviders" , mock .Anything , cid , expectedStream ).Return (results , nil )
89
89
urlStr := serverAddr + ProvidePath + cidStr
90
90
91
91
req , err := http .NewRequest (http .MethodGet , urlStr , nil )
@@ -101,22 +101,22 @@ func TestResponse(t *testing.T) {
101
101
body , err := io .ReadAll (resp .Body )
102
102
require .NoError (t , err )
103
103
104
- require .Equal (t , string (body ), expected )
104
+ require .Equal (t , string (body ), expectedBody )
105
105
}
106
106
107
107
t .Run ("JSON Response" , func (t * testing.T ) {
108
- runTest (t , mediaTypeJSON , `{"Providers":[{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vn","Addrs":[]},{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vz","Addrs":[]}]}` )
108
+ runTest (t , mediaTypeJSON , false , `{"Providers":[{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vn","Addrs":[]},{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vz","Addrs":[]}]}` )
109
109
})
110
110
111
111
t .Run ("NDJSON Response" , func (t * testing.T ) {
112
- runTest (t , mediaTypeNDJSON , `{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vn","Addrs":[]}` + "\n " + `{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vz","Addrs":[]}` + "\n " )
112
+ runTest (t , mediaTypeNDJSON , true , `{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vn","Addrs":[]}` + "\n " + `{"Protocol":"transport-bitswap","Schema":"bitswap","ID":"12D3KooWM8sovaEGU1bmiWGWAzvs47DEcXKZZTuJnpQyVTkRs2Vz","Addrs":[]}` + "\n " )
113
113
})
114
114
}
115
115
116
116
type mockContentRouter struct { mock.Mock }
117
117
118
- func (m * mockContentRouter ) FindProviders (ctx context.Context , key cid.Cid ) (iter.ResultIter [types.ProviderResponse ], error ) {
119
- args := m .Called (ctx , key )
118
+ func (m * mockContentRouter ) FindProviders (ctx context.Context , key cid.Cid , stream bool ) (iter.ResultIter [types.ProviderResponse ], error ) {
119
+ args := m .Called (ctx , key , stream )
120
120
return args .Get (0 ).(iter.ResultIter [types.ProviderResponse ]), args .Error (1 )
121
121
}
122
122
func (m * mockContentRouter ) ProvideBitswap (ctx context.Context , req * BitswapWriteProvideRequest ) (time.Duration , error ) {
0 commit comments