Skip to content

Commit e7648e5

Browse files
joshua-kimjoshua-kim
committed
nit
Signed-off-by: Joshua Kim <[email protected]>
1 parent 08a7282 commit e7648e5

File tree

4 files changed

+59
-63
lines changed

4 files changed

+59
-63
lines changed

‎network/p2p/p2ptest/client.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@ import (
2121

2222
// NewClient generates a client-server pair and returns the client used to
2323
// communicate with a server with the specified handler
24-
func NewClient(t *testing.T, rootCtx context.Context, handler p2p.Handler) *p2p.Client {
24+
func NewClient(
25+
t *testing.T,
26+
rootCtx context.Context,
27+
handler p2p.Handler,
28+
clientNodeID ids.NodeID,
29+
serverNodeID ids.NodeID,
30+
) *p2p.Client {
2531
clientSender := &enginetest.Sender{}
2632
serverSender := &enginetest.Sender{}
2733

28-
clientNodeID := ids.GenerateTestNodeID()
2934
clientNetwork, err := p2p.NewNetwork(logging.NoLog{}, clientSender, prometheus.NewRegistry(), "")
3035
require.NoError(t, err)
3136

32-
serverNodeID := ids.GenerateTestNodeID()
3337
serverNetwork, err := p2p.NewNetwork(logging.NoLog{}, serverSender, prometheus.NewRegistry(), "")
3438
require.NoError(t, err)
3539

‎network/p2p/p2ptest/client_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestNewClient_AppGossip(t *testing.T) {
2727
},
2828
}
2929

30-
client := NewClient(t, ctx, testHandler)
30+
client := NewClient(t, ctx, testHandler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
3131
require.NoError(client.AppGossip(ctx, common.SendConfig{}, []byte("foobar")))
3232
<-appGossipChan
3333
}
@@ -94,7 +94,7 @@ func TestNewClient_AppRequest(t *testing.T) {
9494
},
9595
}
9696

97-
client := NewClient(t, ctx, testHandler)
97+
client := NewClient(t, ctx, testHandler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
9898
require.NoError(tt.appRequestF(
9999
ctx,
100100
client,

‎x/sync/network_server.go

+20-28
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ type SyncGetChangeProofHandler struct {
7575
func (*SyncGetChangeProofHandler) AppGossip(context.Context, ids.NodeID, []byte) {}
7676

7777
func (s *SyncGetChangeProofHandler) AppRequest(ctx context.Context, _ ids.NodeID, _ time.Time, requestBytes []byte) ([]byte, *common.AppError) {
78-
request := &pb.SyncGetChangeProofRequest{}
79-
if err := proto.Unmarshal(requestBytes, request); err != nil {
78+
req := &pb.SyncGetChangeProofRequest{}
79+
if err := proto.Unmarshal(requestBytes, req); err != nil {
8080
return nil, &common.AppError{
8181
Code: p2p.ErrUnexpected.Code,
8282
Message: fmt.Sprintf("failed to unmarshal request: %s", err),
8383
}
8484
}
8585

86-
if err := validateChangeProofRequest(request); err != nil {
86+
if err := validateChangeProofRequest(req); err != nil {
8787
return nil, &common.AppError{
8888
Code: p2p.ErrUnexpected.Code,
8989
Message: fmt.Sprintf("invalid request: %s", err),
@@ -92,21 +92,21 @@ func (s *SyncGetChangeProofHandler) AppRequest(ctx context.Context, _ ids.NodeID
9292

9393
// override limits if they exceed caps
9494
var (
95-
keyLimit = min(request.KeyLimit, maxKeyValuesLimit)
96-
bytesLimit = min(int(request.BytesLimit), maxByteSizeLimit)
97-
start = maybeBytesToMaybe(request.StartKey)
98-
end = maybeBytesToMaybe(request.EndKey)
95+
keyLimit = min(req.KeyLimit, maxKeyValuesLimit)
96+
bytesLimit = min(int(req.BytesLimit), maxByteSizeLimit)
97+
start = maybeBytesToMaybe(req.StartKey)
98+
end = maybeBytesToMaybe(req.EndKey)
9999
)
100100

101-
startRoot, err := ids.ToID(request.StartRootHash)
101+
startRoot, err := ids.ToID(req.StartRootHash)
102102
if err != nil {
103103
return nil, &common.AppError{
104104
Code: p2p.ErrUnexpected.Code,
105105
Message: fmt.Sprintf("failed to parse start root hash: %s", err),
106106
}
107107
}
108108

109-
endRoot, err := ids.ToID(request.EndRootHash)
109+
endRoot, err := ids.ToID(req.EndRootHash)
110110
if err != nil {
111111
return nil, &common.AppError{
112112
Code: p2p.ErrUnexpected.Code,
@@ -140,11 +140,11 @@ func (s *SyncGetChangeProofHandler) AppRequest(ctx context.Context, _ ids.NodeID
140140
ctx,
141141
s.db,
142142
&pb.SyncGetRangeProofRequest{
143-
RootHash: request.EndRootHash,
144-
StartKey: request.StartKey,
145-
EndKey: request.EndKey,
146-
KeyLimit: request.KeyLimit,
147-
BytesLimit: request.BytesLimit,
143+
RootHash: req.EndRootHash,
144+
StartKey: req.StartKey,
145+
EndKey: req.EndKey,
146+
KeyLimit: req.KeyLimit,
147+
BytesLimit: req.BytesLimit,
148148
},
149149
func(rangeProof *merkledb.RangeProof) ([]byte, error) {
150150
return proto.Marshal(&pb.SyncGetChangeProofResponse{
@@ -191,10 +191,6 @@ func (s *SyncGetChangeProofHandler) AppRequest(ctx context.Context, _ ids.NodeID
191191
}
192192
}
193193

194-
func (*SyncGetChangeProofHandler) CrossChainAppRequest(context.Context, ids.ID, time.Time, []byte) ([]byte, error) {
195-
return nil, nil
196-
}
197-
198194
func NewSyncGetRangeProofHandler(log logging.Logger, db DB) *SyncGetRangeProofHandler {
199195
return &SyncGetRangeProofHandler{
200196
log: log,
@@ -210,29 +206,29 @@ type SyncGetRangeProofHandler struct {
210206
func (*SyncGetRangeProofHandler) AppGossip(context.Context, ids.NodeID, []byte) {}
211207

212208
func (s *SyncGetRangeProofHandler) AppRequest(ctx context.Context, _ ids.NodeID, _ time.Time, requestBytes []byte) ([]byte, *common.AppError) {
213-
request := &pb.SyncGetRangeProofRequest{}
214-
if err := proto.Unmarshal(requestBytes, request); err != nil {
209+
req := &pb.SyncGetRangeProofRequest{}
210+
if err := proto.Unmarshal(requestBytes, req); err != nil {
215211
return nil, &common.AppError{
216212
Code: p2p.ErrUnexpected.Code,
217213
Message: fmt.Sprintf("failed to unmarshal request: %s", err),
218214
}
219215
}
220216

221-
if err := validateRangeProofRequest(request); err != nil {
217+
if err := validateRangeProofRequest(req); err != nil {
222218
return nil, &common.AppError{
223219
Code: p2p.ErrUnexpected.Code,
224220
Message: fmt.Sprintf("invalid range proof request: %s", err),
225221
}
226222
}
227223

228224
// override limits if they exceed caps
229-
request.KeyLimit = min(request.KeyLimit, maxKeyValuesLimit)
230-
request.BytesLimit = min(request.BytesLimit, maxByteSizeLimit)
225+
req.KeyLimit = min(req.KeyLimit, maxKeyValuesLimit)
226+
req.BytesLimit = min(req.BytesLimit, maxByteSizeLimit)
231227

232228
proofBytes, err := getRangeProof(
233229
ctx,
234230
s.db,
235-
request,
231+
req,
236232
func(rangeProof *merkledb.RangeProof) ([]byte, error) {
237233
return proto.Marshal(rangeProof.ToProto())
238234
},
@@ -247,10 +243,6 @@ func (s *SyncGetRangeProofHandler) AppRequest(ctx context.Context, _ ids.NodeID,
247243
return proofBytes, nil
248244
}
249245

250-
func (*SyncGetRangeProofHandler) CrossChainAppRequest(context.Context, ids.ID, time.Time, []byte) ([]byte, error) {
251-
return nil, nil
252-
}
253-
254246
// Get the range proof specified by [req].
255247
// If the generated proof is too large, the key limit is reduced
256248
// and the proof is regenerated. This process is repeated until

‎x/sync/sync_test.go

+30-30
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ func Test_Completion(t *testing.T) {
7272
ctx := context.Background()
7373
syncer, err := NewManager(ManagerConfig{
7474
DB: db,
75-
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, emptyDB)),
76-
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, emptyDB)),
75+
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, emptyDB), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
76+
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, emptyDB), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
7777
TargetRoot: emptyRoot,
7878
SimultaneousWorkLimit: 5,
7979
Log: logging.NoLog{},
@@ -177,8 +177,8 @@ func Test_Sync_FindNextKey_InSync(t *testing.T) {
177177
ctx := context.Background()
178178
syncer, err := NewManager(ManagerConfig{
179179
DB: db,
180-
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync)),
181-
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync)),
180+
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
181+
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
182182
TargetRoot: syncRoot,
183183
SimultaneousWorkLimit: 5,
184184
Log: logging.NoLog{},
@@ -373,8 +373,8 @@ func Test_Sync_FindNextKey_ExtraValues(t *testing.T) {
373373
ctx := context.Background()
374374
syncer, err := NewManager(ManagerConfig{
375375
DB: db,
376-
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync)),
377-
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync)),
376+
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
377+
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
378378
TargetRoot: syncRoot,
379379
SimultaneousWorkLimit: 5,
380380
Log: logging.NoLog{},
@@ -436,7 +436,7 @@ func TestFindNextKeyEmptyEndProof(t *testing.T) {
436436
syncer, err := NewManager(ManagerConfig{
437437
DB: db,
438438
RangeProofClient: &p2p.Client{},
439-
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, db)),
439+
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, db), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
440440
TargetRoot: ids.Empty,
441441
SimultaneousWorkLimit: 5,
442442
Log: logging.NoLog{},
@@ -504,8 +504,8 @@ func Test_Sync_FindNextKey_DifferentChild(t *testing.T) {
504504
ctx := context.Background()
505505
syncer, err := NewManager(ManagerConfig{
506506
DB: db,
507-
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync)),
508-
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync)),
507+
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
508+
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
509509
TargetRoot: syncRoot,
510510
SimultaneousWorkLimit: 5,
511511
Log: logging.NoLog{},
@@ -774,7 +774,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
774774
response.KeyValues = append(response.KeyValues, merkledb.KeyValue{})
775775
})
776776

777-
return p2ptest.NewClient(t, context.Background(), handler)
777+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
778778
},
779779
},
780780
{
@@ -784,7 +784,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
784784
response.KeyValues = response.KeyValues[min(1, len(response.KeyValues)):]
785785
})
786786

787-
return p2ptest.NewClient(t, context.Background(), handler)
787+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
788788
},
789789
},
790790
{
@@ -810,7 +810,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
810810
}
811811
})
812812

813-
return p2ptest.NewClient(t, context.Background(), handler)
813+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
814814
},
815815
},
816816
{
@@ -821,7 +821,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
821821
_ = slices.Delete(response.KeyValues, i, min(len(response.KeyValues), i+1))
822822
})
823823

824-
return p2ptest.NewClient(t, context.Background(), handler)
824+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
825825
},
826826
},
827827
{
@@ -832,7 +832,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
832832
response.EndProof = nil
833833
})
834834

835-
return p2ptest.NewClient(t, context.Background(), handler)
835+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
836836
},
837837
},
838838
{
@@ -842,7 +842,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
842842
response.EndProof = nil
843843
})
844844

845-
return p2ptest.NewClient(t, context.Background(), handler)
845+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
846846
},
847847
},
848848
{
@@ -854,7 +854,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
854854
response.KeyValues = nil
855855
})
856856

857-
return p2ptest.NewClient(t, context.Background(), handler)
857+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
858858
},
859859
},
860860
{
@@ -863,7 +863,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
863863
return p2ptest.NewClient(t, context.Background(), &flakyHandler{
864864
Handler: NewSyncGetRangeProofHandler(logging.NoLog{}, db),
865865
c: &counter{m: 2},
866-
})
866+
}, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
867867
},
868868
},
869869
{
@@ -873,7 +873,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
873873
response.KeyChanges = append(response.KeyChanges, make([]merkledb.KeyChange, defaultRequestKeyLimit)...)
874874
})
875875

876-
return p2ptest.NewClient(t, context.Background(), handler)
876+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
877877
},
878878
},
879879
{
@@ -883,7 +883,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
883883
response.KeyChanges = response.KeyChanges[min(1, len(response.KeyChanges)):]
884884
})
885885

886-
return p2ptest.NewClient(t, context.Background(), handler)
886+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
887887
},
888888
},
889889
{
@@ -894,7 +894,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
894894
_ = slices.Delete(response.KeyChanges, i, min(len(response.KeyChanges), i+1))
895895
})
896896

897-
return p2ptest.NewClient(t, context.Background(), handler)
897+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
898898
},
899899
},
900900
{
@@ -905,7 +905,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
905905
response.EndProof = nil
906906
})
907907

908-
return p2ptest.NewClient(t, context.Background(), handler)
908+
return p2ptest.NewClient(t, context.Background(), handler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
909909
},
910910
},
911911
{
@@ -914,7 +914,7 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
914914
return p2ptest.NewClient(t, context.Background(), &flakyHandler{
915915
Handler: NewSyncGetChangeProofHandler(logging.NoLog{}, db),
916916
c: &counter{m: 2},
917-
})
917+
}, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
918918
},
919919
},
920920
}
@@ -943,13 +943,13 @@ func Test_Sync_Result_Correct_Root(t *testing.T) {
943943
)
944944

945945
rangeProofHandler := NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync)
946-
rangeProofClient = p2ptest.NewClient(t, ctx, rangeProofHandler)
946+
rangeProofClient = p2ptest.NewClient(t, ctx, rangeProofHandler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
947947
if tt.rangeProofClient != nil {
948948
rangeProofClient = tt.rangeProofClient(dbToSync)
949949
}
950950

951951
changeProofHandler := NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync)
952-
changeProofClient = p2ptest.NewClient(t, ctx, changeProofHandler)
952+
changeProofClient = p2ptest.NewClient(t, ctx, changeProofHandler, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
953953
if tt.changeProofClient != nil {
954954
changeProofClient = tt.changeProofClient(dbToSync)
955955
}
@@ -1024,8 +1024,8 @@ func Test_Sync_Result_Correct_Root_With_Sync_Restart(t *testing.T) {
10241024
ctx := context.Background()
10251025
syncer, err := NewManager(ManagerConfig{
10261026
DB: db,
1027-
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync)),
1028-
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync)),
1027+
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
1028+
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
10291029
TargetRoot: syncRoot,
10301030
SimultaneousWorkLimit: 5,
10311031
Log: logging.NoLog{},
@@ -1051,8 +1051,8 @@ func Test_Sync_Result_Correct_Root_With_Sync_Restart(t *testing.T) {
10511051

10521052
newSyncer, err := NewManager(ManagerConfig{
10531053
DB: db,
1054-
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync)),
1055-
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync)),
1054+
RangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
1055+
ChangeProofClient: p2ptest.NewClient(t, ctx, NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync), ids.GenerateTestNodeID(), ids.GenerateTestNodeID()),
10561056
TargetRoot: syncRoot,
10571057
SimultaneousWorkLimit: 5,
10581058
Log: logging.NoLog{},
@@ -1124,12 +1124,12 @@ func Test_Sync_Result_Correct_Root_Update_Root_During(t *testing.T) {
11241124
rangeProofClient := p2ptest.NewClient(t, ctx, &testHandler{
11251125
handler: NewSyncGetRangeProofHandler(logging.NoLog{}, dbToSync),
11261126
updatedRootChan: updatedRootChan,
1127-
})
1127+
}, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
11281128

11291129
changeProofClient := p2ptest.NewClient(t, ctx, &testHandler{
11301130
handler: NewSyncGetChangeProofHandler(logging.NoLog{}, dbToSync),
11311131
updatedRootChan: updatedRootChan,
1132-
})
1132+
}, ids.GenerateTestNodeID(), ids.GenerateTestNodeID())
11331133

11341134
syncer, err := NewManager(ManagerConfig{
11351135
DB: db,

0 commit comments

Comments
 (0)