Skip to content

Commit

Permalink
chore: fixing the conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
b00f committed Jun 30, 2023
1 parent 6176484 commit e219bee
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sync/mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func MockingSync(ts *testsuite.TestSuite) *MockSync {
ps.UpdateHeight(pid1, ts.RandUint32(100000))

return &MockSync{
TestID: network.TestRandomPeerID(),
TestID: ts.RandomPeerID(),
TestPeerSet: ps,
}
}
Expand Down
4 changes: 2 additions & 2 deletions www/http/blockchain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ func TestNetworkInfo(t *testing.T) {
}

func TestNodeInfo(t *testing.T) {
setup(t)
td := setup(t)

w := httptest.NewRecorder()
r := new(http.Request)

tHTTPServer.NodeHandler(w, r)
td.httpServer.NodeHandler(w, r)

assert.Equal(t, w.Code, 200)
assert.Contains(t, w.Body.String(), version.Agent())
Expand Down

0 comments on commit e219bee

Please sign in to comment.