Skip to content

Commit a63b7b6

Browse files
ashish10677ashish10677
committed
Merge branch 'main' into rogue-stakerId
2 parents cc6e22c + d468db8 commit a63b7b6

9 files changed

+11680
-3242
lines changed

‎addresses.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"Governance": "0x5519607fbe47b4f79304c0d3af30adf8ed88e71b",
3-
"BlockManager": "0x99cfdbd83f380966a83b57fadf150e57af7bf8e1",
4-
"CollectionManager": "0xAaA662765aeBacD36Bc6772952Ca80EDff25a29E",
5-
"StakeManager": "0xe46Cfb79C13F91749744a3A6BDda58C73cBbb69d",
6-
"RewardManager": "0x2864D9ea9691d85f2D67e03d406E4F025412F163",
7-
"VoteManager": "0xa65CA6c0fc8f62cC7d44084661B5818704896Fb9",
8-
"Delegator": "0x51f37a56523Ca1E63Dd92c1954f6e1587b415ED1",
9-
"RAZOR": "0xdB3d6a2fF3BF8Ed487597C133ad0D172A54f5531",
10-
"StakedTokenFactory": "0x4640b85299afB160576d849E17f7AAc160f8DC30",
11-
"RandomNoManager": "0x0A3f87772eb9a256cFE84A47D455A780Bc8dC9E7"
12-
}
2+
"Governance": "0xE77eb6AecBc5A8fC88EcDeAeA600a205220B89AC",
3+
"BlockManager": "0xd53A336F07dd93Da46b709B3f3594039A5557867",
4+
"CollectionManager": "0x5471A788c1D31CacAbeeEfA28dF2e0c6b279542C",
5+
"StakeManager": "0xaa95236294661AB21E753AC68D816605A968DEc8",
6+
"RewardManager": "0xA29d14Bbf9302cc22E32902b050EbdDa128D7895",
7+
"VoteManager": "0xdd3baA3Ae01e14833e049aB7DDDD87f43DAddFcC",
8+
"Delegator": "0x231e6F5D9479ea90aF03126793a61E7a7118b395",
9+
"RAZOR": "0x254EEeac877b7EA3d79c17144d9f2611f28486db",
10+
"StakedTokenFactory": "0x8a6b8d591ca37574fD9B5b5A05F8A3C04B7e81c4",
11+
"RandomNoManager": "0x1241A7759e482f04048F12E4F645c8Cb38175817"
12+
}

‎cmd/claimBounty_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ func TestClaimBounty(t *testing.T) {
149149
redeemBountyTxn *Types.Transaction
150150
redeemBountyErr error
151151
hash common.Hash
152+
time string
152153
}
153154
tests := []struct {
154155
name string
@@ -171,17 +172,16 @@ func TestClaimBounty(t *testing.T) {
171172
wantErr: nil,
172173
},
173174
{
174-
name: "Test 2: When claimBounty function executes successfully after waiting for few epochs",
175+
name: "Test 2: When claimBounty function exits successfully if lock is not reached",
175176
args: args{
176177
epoch: 70,
177178
bountyLock: types.BountyLock{
178179
Amount: big.NewInt(1000),
179180
RedeemAfter: 80,
180181
},
181182
redeemBountyTxn: &Types.Transaction{},
182-
hash: common.BigToHash(big.NewInt(1)),
183183
},
184-
want: common.BigToHash(big.NewInt(1)),
184+
want: core.NilHash,
185185
wantErr: nil,
186186
},
187187
{
@@ -246,6 +246,7 @@ func TestClaimBounty(t *testing.T) {
246246
utilsMock.On("CalculateBlockTime", mock.AnythingOfType("*ethclient.Client")).Return(blockTime)
247247
utilsMock.On("GetTxnOpts", mock.AnythingOfType("types.TransactionOptions")).Return(txnOpts)
248248
stakeManagerMock.On("RedeemBounty", mock.AnythingOfType("*ethclient.Client"), mock.AnythingOfType("*bind.TransactOpts"), mock.AnythingOfType("uint32")).Return(tt.args.redeemBountyTxn, tt.args.redeemBountyErr)
249+
utilsMock.On("SecondsToReadableTime", mock.AnythingOfType("int")).Return(tt.args.time)
249250
trasactionUtilsMock.On("Hash", mock.Anything).Return(tt.args.hash)
250251

251252
utils := &UtilsStruct{}

‎cmd/modifyCollectionStatus_test.go

+70-70
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ func TestModifyAssetStatus(t *testing.T) {
194194

195195
utils := &UtilsStruct{}
196196

197-
got, err := utils.ModifyAssetStatus(client, config, types.ModifyAssetInput{
197+
got, err := utils.ModifyCollectionStatus(client, config, types.ModifyCollectionInput{
198198
Status: tt.args.status,
199199
})
200200
if got != tt.want {
@@ -220,19 +220,19 @@ func TestExecuteModifyAssetStatus(t *testing.T) {
220220
var client *ethclient.Client
221221

222222
type args struct {
223-
config types.Configurations
224-
configErr error
225-
address string
226-
addressErr error
227-
assetId uint16
228-
assetIdErr error
229-
status string
230-
statusErr error
231-
parseStatus bool
232-
parseStatusErr error
233-
password string
234-
ModifyAssetStatusHash common.Hash
235-
ModifyAssetStatusErr error
223+
config types.Configurations
224+
configErr error
225+
address string
226+
addressErr error
227+
collectionId uint16
228+
collectionIdErr error
229+
status string
230+
statusErr error
231+
parseStatus bool
232+
parseStatusErr error
233+
password string
234+
ModifyCollectionStatusHash common.Hash
235+
ModifyCollectionStatusErr error
236236
}
237237
tests := []struct {
238238
name string
@@ -242,94 +242,94 @@ func TestExecuteModifyAssetStatus(t *testing.T) {
242242
{
243243
name: "Test 1: When ModifyAssetStatus executes successfully",
244244
args: args{
245-
config: config,
246-
address: "0x000000000000000000000000000000000000dea1",
247-
assetId: 1,
248-
status: "true",
249-
parseStatus: true,
250-
password: "test",
251-
ModifyAssetStatusHash: common.BigToHash(big.NewInt(1)),
245+
config: config,
246+
address: "0x000000000000000000000000000000000000dea1",
247+
collectionId: 1,
248+
status: "true",
249+
parseStatus: true,
250+
password: "test",
251+
ModifyCollectionStatusHash: common.BigToHash(big.NewInt(1)),
252252
},
253253
expectedFatal: false,
254254
},
255255
{
256256
name: "Test 2: When there is an error in getting address",
257257
args: args{
258-
config: config,
259-
address: "",
260-
addressErr: errors.New("address error"),
261-
assetId: 1,
262-
status: "true",
263-
parseStatus: true,
264-
password: "test",
265-
ModifyAssetStatusHash: common.BigToHash(big.NewInt(1)),
258+
config: config,
259+
address: "",
260+
addressErr: errors.New("address error"),
261+
collectionId: 1,
262+
status: "true",
263+
parseStatus: true,
264+
password: "test",
265+
ModifyCollectionStatusHash: common.BigToHash(big.NewInt(1)),
266266
},
267267
expectedFatal: true,
268268
},
269269
{
270-
name: "Test 3: When there is an error in getting assetId",
270+
name: "Test 3: When there is an error in getting collectionId",
271271
args: args{
272-
config: config,
273-
address: "0x000000000000000000000000000000000000dea1",
274-
assetIdErr: errors.New("assetId error"),
275-
status: "true",
276-
parseStatus: true,
277-
password: "test",
278-
ModifyAssetStatusHash: common.BigToHash(big.NewInt(1)),
272+
config: config,
273+
address: "0x000000000000000000000000000000000000dea1",
274+
collectionIdErr: errors.New("assetId error"),
275+
status: "true",
276+
parseStatus: true,
277+
password: "test",
278+
ModifyCollectionStatusHash: common.BigToHash(big.NewInt(1)),
279279
},
280280
expectedFatal: true,
281281
},
282282
{
283283
name: "Test 4: When there is an error in getting status string",
284284
args: args{
285-
config: config,
286-
address: "0x000000000000000000000000000000000000dea1",
287-
assetId: 1,
288-
statusErr: errors.New("status error"),
289-
parseStatus: true,
290-
password: "test",
291-
ModifyAssetStatusHash: common.BigToHash(big.NewInt(1)),
285+
config: config,
286+
address: "0x000000000000000000000000000000000000dea1",
287+
collectionId: 1,
288+
statusErr: errors.New("status error"),
289+
parseStatus: true,
290+
password: "test",
291+
ModifyCollectionStatusHash: common.BigToHash(big.NewInt(1)),
292292
},
293293
expectedFatal: true,
294294
},
295295
{
296296
name: "Test 5: When there is an error in parsing status to bool",
297297
args: args{
298-
config: config,
299-
address: "0x000000000000000000000000000000000000dea1",
300-
assetId: 1,
301-
status: "true",
302-
parseStatusErr: errors.New("parsing status error"),
303-
password: "test",
304-
ModifyAssetStatusHash: common.BigToHash(big.NewInt(1)),
298+
config: config,
299+
address: "0x000000000000000000000000000000000000dea1",
300+
collectionId: 1,
301+
status: "true",
302+
parseStatusErr: errors.New("parsing status error"),
303+
password: "test",
304+
ModifyCollectionStatusHash: common.BigToHash(big.NewInt(1)),
305305
},
306306
expectedFatal: true,
307307
},
308308
{
309309
name: "Test 6: When there is an error from ModifyAssetStatus",
310310
args: args{
311-
config: config,
312-
address: "0x000000000000000000000000000000000000dea1",
313-
assetId: 1,
314-
status: "true",
315-
parseStatus: true,
316-
password: "test",
317-
ModifyAssetStatusHash: core.NilHash,
318-
ModifyAssetStatusErr: errors.New("ModifyAssetStatus error"),
311+
config: config,
312+
address: "0x000000000000000000000000000000000000dea1",
313+
collectionId: 1,
314+
status: "true",
315+
parseStatus: true,
316+
password: "test",
317+
ModifyCollectionStatusHash: core.NilHash,
318+
ModifyCollectionStatusErr: errors.New("ModifyAssetStatus error"),
319319
},
320320
expectedFatal: true,
321321
},
322322
{
323323
name: "Test 7: When there ia n error in getting config",
324324
args: args{
325-
config: config,
326-
configErr: errors.New("config error"),
327-
address: "0x000000000000000000000000000000000000dea1",
328-
assetId: 1,
329-
status: "true",
330-
parseStatus: true,
331-
password: "test",
332-
ModifyAssetStatusHash: common.BigToHash(big.NewInt(1)),
325+
config: config,
326+
configErr: errors.New("config error"),
327+
address: "0x000000000000000000000000000000000000dea1",
328+
collectionId: 1,
329+
status: "true",
330+
parseStatus: true,
331+
password: "test",
332+
ModifyCollectionStatusHash: common.BigToHash(big.NewInt(1)),
333333
},
334334
expectedFatal: true,
335335
},
@@ -355,18 +355,18 @@ func TestExecuteModifyAssetStatus(t *testing.T) {
355355
utilsMock.On("AssignLogFile", mock.AnythingOfType("*pflag.FlagSet"))
356356
cmdUtilsMock.On("GetConfigData").Return(tt.args.config, tt.args.configErr)
357357
flagsetUtilsMock.On("GetStringAddress", flagSet).Return(tt.args.address, tt.args.addressErr)
358-
flagsetUtilsMock.On("GetUint16AssetId", flagSet).Return(tt.args.assetId, tt.args.assetIdErr)
358+
flagsetUtilsMock.On("GetUint16CollectionId", flagSet).Return(tt.args.collectionId, tt.args.collectionIdErr)
359359
flagsetUtilsMock.On("GetStringStatus", flagSet).Return(tt.args.status, tt.args.statusErr)
360360
utilsMock.On("AssignPassword", flagSet).Return(tt.args.password)
361361
stringMock.On("ParseBool", mock.AnythingOfType("string")).Return(tt.args.parseStatus, tt.args.parseStatusErr)
362362
utilsMock.On("ConnectToClient", mock.AnythingOfType("string")).Return(client)
363-
cmdUtilsMock.On("ModifyAssetStatus", mock.Anything, mock.Anything, mock.Anything).Return(tt.args.ModifyAssetStatusHash, tt.args.ModifyAssetStatusErr)
363+
cmdUtilsMock.On("ModifyCollectionStatus", mock.Anything, mock.Anything, mock.Anything).Return(tt.args.ModifyCollectionStatusHash, tt.args.ModifyCollectionStatusErr)
364364
utilsMock.On("WaitForBlockCompletion", mock.AnythingOfType("*ethclient.Client"), mock.AnythingOfType("string")).Return(1)
365365

366366
utils := &UtilsStruct{}
367367
fatal = false
368368

369-
utils.ExecuteModifyAssetStatus(flagSet)
369+
utils.ExecuteModifyCollectionStatus(flagSet)
370370

371371
if fatal != tt.expectedFatal {
372372
t.Error("The ExecuteModifyAssetStatus function didn't execute as expected")

0 commit comments

Comments
 (0)