@@ -920,7 +920,6 @@ func TestAutoRestart(t *testing.T) {
920920// 6. The connection is automatically re-established and the transfer completes
921921func TestAutoRestartAfterBouncingInitiator (t * testing.T ) {
922922 t .Skip ("flaky test" )
923- SetDTLogLevelDebug ()
924923
925924 runTest := func (t * testing.T , isPush bool ) {
926925 ctx := context .Background ()
@@ -1484,13 +1483,13 @@ func TestPauseAndResume(t *testing.T) {
14841483 resumeResponder := make (chan struct {}, 2 )
14851484 var subscriber datatransfer.Subscriber = func (event datatransfer.Event , channelState datatransfer.ChannelState ) {
14861485
1487- if event .Code == datatransfer .DataQueued {
1486+ if event .Code == datatransfer .DataQueuedProgress {
14881487 if channelState .Queued () > 0 {
14891488 sent <- channelState .Queued ()
14901489 }
14911490 }
14921491
1493- if event .Code == datatransfer .DataReceived {
1492+ if event .Code == datatransfer .DataReceivedProgress {
14941493 if channelState .Received () > 0 {
14951494 received <- channelState .Received ()
14961495 }
@@ -1784,7 +1783,7 @@ func (fgsr *fakeGraphSyncReceiver) consumeResponses(ctx context.Context, t *test
17841783 t .Fail ()
17851784 case gsMessageReceived = <- fgsr .receivedMessages :
17861785 responses := gsMessageReceived .message .Responses ()
1787- if (len (responses ) > 0 ) && gsmsg . IsTerminalResponseCode ( responses [0 ].Status ()) {
1786+ if (len (responses ) > 0 ) && responses [0 ].Status (). IsTerminal ( ) {
17881787 return responses [0 ].Status ()
17891788 }
17901789 }
@@ -1834,16 +1833,13 @@ func TestRespondingToPushGraphsyncRequests(t *testing.T) {
18341833 }
18351834 requestReceived := messageReceived .message .(datatransfer.Request )
18361835
1837- var buf bytes.Buffer
18381836 response , err := message .NewResponse (requestReceived .TransferID (), true , false , voucherResult .Type (), voucherResult )
18391837 require .NoError (t , err )
1840- err = response .ToNet ( & buf )
1838+ nd , err : =response .ToIPLD ( )
18411839 require .NoError (t , err )
1842- extData := buf .Bytes ()
1843-
1844- request := gsmsg .NewRequest (graphsync .RequestID (rand .Int31 ()), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
1840+ request := gsmsg .NewRequest (graphsync .NewRequestID (), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
18451841 Name : extension .ExtensionDataTransfer1_1 ,
1846- Data : extData ,
1842+ Data : nd ,
18471843 })
18481844 builder := gsmsg .NewBuilder ()
18491845 builder .AddRequest (request )
@@ -1852,20 +1848,17 @@ func TestRespondingToPushGraphsyncRequests(t *testing.T) {
18521848 require .NoError (t , gsData .GsNet2 .SendMessage (ctx , host1 .ID (), gsmessage ))
18531849
18541850 status := gsr .consumeResponses (ctx , t )
1855- require .False (t , gsmsg . IsTerminalFailureCode ( status ))
1851+ require .False (t , status . IsFailure ( ))
18561852 })
18571853
18581854 t .Run ("when no request is initiated" , func (t * testing.T ) {
1859- var buf bytes.Buffer
1860- response , err := message .NewResponse (datatransfer .TransferID (rand .Uint64 ()), true , false , voucher .Type (), voucher )
1855+ response , err := message .NewResponse (datatransfer .TransferID (rand .Uint32 ()), true , false , voucher .Type (), voucher )
18611856 require .NoError (t , err )
1862- err = response .ToNet ( & buf )
1857+ nd , err : =response .ToIPLD ( )
18631858 require .NoError (t , err )
1864- extData := buf .Bytes ()
1865-
1866- request := gsmsg .NewRequest (graphsync .RequestID (rand .Int31 ()), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
1859+ request := gsmsg .NewRequest (graphsync .NewRequestID (), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
18671860 Name : extension .ExtensionDataTransfer1_1 ,
1868- Data : extData ,
1861+ Data : nd ,
18691862 })
18701863 builder := gsmsg .NewBuilder ()
18711864 builder .AddRequest (request )
@@ -1874,7 +1867,7 @@ func TestRespondingToPushGraphsyncRequests(t *testing.T) {
18741867 require .NoError (t , gsData .GsNet2 .SendMessage (ctx , host1 .ID (), gsmessage ))
18751868
18761869 status := gsr .consumeResponses (ctx , t )
1877- require .True (t , gsmsg . IsTerminalFailureCode ( status ))
1870+ require .True (t , status . IsFailure ( ))
18781871 })
18791872}
18801873
@@ -1923,15 +1916,15 @@ func TestResponseHookWhenExtensionNotFound(t *testing.T) {
19231916 case <- r .messageReceived :
19241917 }
19251918
1926- request := gsmsg .NewRequest (graphsync .RequestID ( rand . Int31 () ), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()))
1919+ request := gsmsg .NewRequest (graphsync .NewRequestID ( ), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()))
19271920 builder := gsmsg .NewBuilder ()
19281921 builder .AddRequest (request )
19291922 gsmessage , err := builder .Build ()
19301923 require .NoError (t , err )
19311924 require .NoError (t , gsData .GsNet2 .SendMessage (ctx , host1 .ID (), gsmessage ))
19321925
19331926 status := gsr .consumeResponses (ctx , t )
1934- assert .False (t , gsmsg . IsTerminalFailureCode ( status ))
1927+ assert .False (t , status . IsFailure ( ))
19351928 })
19361929}
19371930
@@ -1954,14 +1947,10 @@ func TestRespondingToPullGraphsyncRequests(t *testing.T) {
19541947 voucher := testutil .NewFakeDTType ()
19551948 request , err := message .NewRequest (id , false , true , voucher .Type (), voucher , testutil .GenerateCids (1 )[0 ], gsData .AllSelector )
19561949 require .NoError (t , err )
1957- buf := new (bytes.Buffer )
1958- err = request .ToNet (buf )
1959- require .NoError (t , err )
1960- extData := buf .Bytes ()
1961-
1962- gsRequest := gsmsg .NewRequest (graphsync .RequestID (rand .Int31 ()), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
1950+ nd , err := request .ToIPLD ()
1951+ gsRequest := gsmsg .NewRequest (graphsync .NewRequestID (), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
19631952 Name : extension .ExtensionDataTransfer1_1 ,
1964- Data : extData ,
1953+ Data : nd ,
19651954 })
19661955
19671956 // initiator requests data over graphsync network
@@ -1971,7 +1960,7 @@ func TestRespondingToPullGraphsyncRequests(t *testing.T) {
19711960 require .NoError (t , err )
19721961 require .NoError (t , gsData .GsNet1 .SendMessage (ctx , gsData .Host2 .ID (), gsmessage ))
19731962 status := gsr .consumeResponses (ctx , t )
1974- require .False (t , gsmsg . IsTerminalFailureCode ( status ))
1963+ require .False (t , status . IsFailure ( ))
19751964 },
19761965 },
19771966 "When request is initiated, but fails validation" : {
@@ -1986,13 +1975,11 @@ func TestRespondingToPullGraphsyncRequests(t *testing.T) {
19861975 dtRequest , err := message .NewRequest (id , false , true , voucher .Type (), voucher , testutil .GenerateCids (1 )[0 ], gsData .AllSelector )
19871976 require .NoError (t , err )
19881977
1989- buf := new (bytes.Buffer )
1990- err = dtRequest .ToNet (buf )
1978+ nd , err := dtRequest .ToIPLD ()
19911979 require .NoError (t , err )
1992- extData := buf .Bytes ()
1993- request := gsmsg .NewRequest (graphsync .RequestID (rand .Int31 ()), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
1980+ request := gsmsg .NewRequest (graphsync .NewRequestID (), link .(cidlink.Link ).Cid , gsData .AllSelector , graphsync .Priority (rand .Int31 ()), graphsync.ExtensionData {
19941981 Name : extension .ExtensionDataTransfer1_1 ,
1995- Data : extData ,
1982+ Data : nd ,
19961983 })
19971984 builder := gsmsg .NewBuilder ()
19981985 builder .AddRequest (request )
@@ -2003,7 +1990,7 @@ func TestRespondingToPullGraphsyncRequests(t *testing.T) {
20031990 // because there was no previous request
20041991 require .NoError (t , gsData .GsNet1 .SendMessage (ctx , gsData .Host2 .ID (), gsmessage ))
20051992 status := gsr .consumeResponses (ctx , t )
2006- require .True (t , gsmsg . IsTerminalFailureCode ( status ))
1993+ require .True (t , status . IsFailure ( ))
20071994 },
20081995 },
20091996 }
@@ -2189,7 +2176,6 @@ func (r *completeRevalidator) OnComplete(chid datatransfer.ChannelID) (bool, dat
21892176}
21902177
21912178func TestMultipleParallelTransfers (t * testing.T ) {
2192- SetDTLogLevelDebug ()
21932179
21942180 // Add more sizes here to trigger more transfers.
21952181 sizes := []int {300000 , 256000 , 200000 , 256000 }
0 commit comments