Skip to content

Commit 77f9f13

Browse files
Eslam-NawaraEslam-Nawara
committed
fix tests
1 parent 9a5fdc9 commit 77f9f13

File tree

6 files changed

+66
-67
lines changed

6 files changed

+66
-67
lines changed

‎node-registrar/client/account_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestCreateAccount(t *testing.T) {
2828
}))
2929
defer testServer.Close()
3030

31-
baseURL, err := url.JoinPath(testServer.URL, "v1")
31+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
3232
require.NoError(err)
3333

3434
request = newClientWithNoAccount
@@ -62,7 +62,7 @@ func TestUpdateAccount(t *testing.T) {
6262
}))
6363
defer testServer.Close()
6464

65-
baseURL, err := url.JoinPath(testServer.URL, "v1")
65+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
6666
require.NoError(err)
6767

6868
t.Run("test update account updated successfully", func(t *testing.T) {
@@ -112,7 +112,7 @@ func TestGetAccount(t *testing.T) {
112112
}))
113113
defer testServer.Close()
114114

115-
baseURL, err := url.JoinPath(testServer.URL, "v1")
115+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
116116
require.NoError(err)
117117

118118
count = 0

‎node-registrar/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestNewRegistrarClient(t *testing.T) {
2828
}))
2929
defer testServer.Close()
3030

31-
baseURL, err := url.JoinPath(testServer.URL, "v1")
31+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
3232
require.NoError(err)
3333

3434
t.Run("test new registrar client with no account", func(t *testing.T) {

‎node-registrar/client/farm_test.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestCreateFarm(t *testing.T) {
2828
}))
2929
defer testServer.Close()
3030

31-
baseURL, err := url.JoinPath(testServer.URL, "v1")
31+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
3232
require.NoError(err)
3333

3434
request = newClientWithAccountNoNode
@@ -68,7 +68,7 @@ func TestUpdateFarm(t *testing.T) {
6868
}))
6969
defer testServer.Close()
7070

71-
baseURL, err := url.JoinPath(testServer.URL, "v1")
71+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
7272
require.NoError(err)
7373

7474
t.Run("test update farm with status unauthorzed", func(t *testing.T) {
@@ -113,7 +113,7 @@ func TestGetFarm(t *testing.T) {
113113
}))
114114
defer testServer.Close()
115115

116-
baseURL, err := url.JoinPath(testServer.URL, "v1")
116+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
117117
require.NoError(err)
118118

119119
count = 0
@@ -153,16 +153,15 @@ func TestApproveNodes(t *testing.T) {
153153
}))
154154
defer testServer.Close()
155155

156-
baseURL, err := url.JoinPath(testServer.URL, "v1")
156+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
157157
require.NoError(err)
158158

159159
t.Run("test approve nodes with status unauthorized", func(t *testing.T) {
160160
count = 0
161-
request = newClientWithNoAccount
161+
request = newClientWithAccountNoNode
162162
c, err := NewRegistrarClient(baseURL, testMnemonic)
163163
require.NoError(err)
164164

165-
count = 0
166165
request = approveNodesWithStatusUnauthorized
167166
err = c.ApproveNodes(farmID, []uint64{1, 2, 3})
168167
require.Error(err)
@@ -174,7 +173,6 @@ func TestApproveNodes(t *testing.T) {
174173
c, err := NewRegistrarClient(baseURL, testMnemonic)
175174
require.NoError(err)
176175

177-
count = 0
178176
request = approveNodesWithStatusOK
179177
err = c.ApproveNodes(farmID, []uint64{1, 2, 3})
180178
require.NoError(err)

‎node-registrar/client/node.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (c *RegistrarClient) updateNode(opts NodeUpdate) (err error) {
160160
return errors.Wrap(err, "failed to construct registrar url")
161161
}
162162

163-
node = c.parseUpdateNodeOpts(node, opts)
163+
node = parseUpdateNodeOpts(node, opts)
164164

165165
handler := func(body bytes.Buffer) error {
166166
req, err := http.NewRequest("PATCH", url, &body)
@@ -437,7 +437,7 @@ func (c *RegistrarClient) ensureNodeID() error {
437437
return nil
438438
}
439439

440-
func (c *RegistrarClient) parseUpdateNodeOpts(node Node, update NodeUpdate) Node {
440+
func parseUpdateNodeOpts(node Node, update NodeUpdate) Node {
441441
if update.FarmID != nil {
442442
node.FarmID = *update.FarmID
443443
}

‎node-registrar/client/node_test.go

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package client
22

33
import (
4+
"encoding/base64"
45
"net/http"
56
"net/http/httptest"
67
"net/url"
@@ -20,6 +21,10 @@ func TestRegistarNode(t *testing.T) {
2021
FarmID: farmID,
2122
}
2223

24+
keyPair, err := parseKeysFromMnemonicOrSeed(testMnemonic)
25+
require.NoError(err)
26+
account.PublicKey = base64.StdEncoding.EncodeToString(keyPair.Public())
27+
2328
testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
2429
statusCode, body := serverHandler(r, request, count, require)
2530
w.WriteHeader(statusCode)
@@ -29,7 +34,7 @@ func TestRegistarNode(t *testing.T) {
2934
}))
3035
defer testServer.Close()
3136

32-
baseURL, err := url.JoinPath(testServer.URL, "v1")
37+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
3338
require.NoError(err)
3439

3540
t.Run("test registar node no account", func(t *testing.T) {
@@ -73,10 +78,10 @@ func TestUpdateNode(t *testing.T) {
7378
var count int
7479
require := require.New(t)
7580

76-
// publicKey, privateKey, err := aliceKeys()
77-
// require.NoError(err)
78-
// account.PublicKey = base64.StdEncoding.EncodeToString(publicKey)
79-
//
81+
keyPair, err := parseKeysFromMnemonicOrSeed(testMnemonic)
82+
require.NoError(err)
83+
account.PublicKey = base64.StdEncoding.EncodeToString(keyPair.Public())
84+
8085
testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
8186
statusCode, body := serverHandler(r, request, count, require)
8287
w.WriteHeader(statusCode)
@@ -86,7 +91,7 @@ func TestUpdateNode(t *testing.T) {
8691
}))
8792
defer testServer.Close()
8893

89-
baseURL, err := url.JoinPath(testServer.URL, "v1")
94+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
9095
require.NoError(err)
9196

9297
request = newClientWithAccountAndNode
@@ -118,9 +123,9 @@ func TestGetNode(t *testing.T) {
118123
var count int
119124
require := require.New(t)
120125

121-
// publicKey, privateKey, err := aliceKeys()
122-
// require.NoError(err)
123-
// account.PublicKey = base64.StdEncoding.EncodeToString(publicKey)
126+
keyPair, err := parseKeysFromMnemonicOrSeed(testMnemonic)
127+
require.NoError(err)
128+
account.PublicKey = base64.StdEncoding.EncodeToString(keyPair.Public())
124129

125130
testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
126131
statusCode, body := serverHandler(r, request, count, require)
@@ -131,7 +136,7 @@ func TestGetNode(t *testing.T) {
131136
}))
132137
defer testServer.Close()
133138

134-
baseURL, err := url.JoinPath(testServer.URL, "v1")
139+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
135140
require.NoError(err)
136141

137142
request = newClientWithAccountAndNode
@@ -172,6 +177,10 @@ func TestListUnapprovedNodes(t *testing.T) {
172177
var count int
173178
require := require.New(t)
174179

180+
keyPair, err := parseKeysFromMnemonicOrSeed(testMnemonic)
181+
require.NoError(err)
182+
account.PublicKey = base64.StdEncoding.EncodeToString(keyPair.Public())
183+
175184
testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
176185
statusCode, body := serverHandler(r, request, count, require)
177186
w.WriteHeader(statusCode)
@@ -181,7 +190,7 @@ func TestListUnapprovedNodes(t *testing.T) {
181190
}))
182191
defer testServer.Close()
183192

184-
baseURL, err := url.JoinPath(testServer.URL, "v1")
193+
baseURL, err := url.JoinPath(testServer.URL, "api", "v1")
185194
require.NoError(err)
186195

187196
t.Run("test list unapproved nodes in farm", func(t *testing.T) {

0 commit comments

Comments
 (0)