CLI tests, updates, fixes (reflect hw options)

master
michael 2022-09-22 23:59:03 +00:00
parent e57473e2d2
commit fba158d4d1
4 changed files with 12 additions and 6 deletions

View File

@ -10,16 +10,19 @@ colineard tx colinearcore unlock-all-funds -y --from alice \
| swallow "Unlock all funds before proceeding" | swallow "Unlock all funds before proceeding"
colineard tx colinearcore new-auction asdf asdf 2000 uusdc $(now + 3500) \ colineard tx colinearcore new-auction asdf asdf 2000 uusdc $(now + 3500) \
'[]' '["gtx-1050-ti"]' 4 0 1000 50 \
-y --from bob \ -y --from bob \
| expect_fail "Can't create auction below min lease period" | expect_fail "Can't create auction below min lease period"
colineard tx colinearcore new-auction asdf asdf 2000 uusdc $(now + 8200000) \ colineard tx colinearcore new-auction asdf asdf 2000 uusdc $(now + 8200000) \
'[]' '["gtx-1050-ti"]' 4 0 1000 50 \
-y --from bob \ -y --from bob \
| expect_fail "Can't create auction above max lease period" | expect_fail "Can't create auction above max lease period"
before=$(get_balance $BOB uusdc) before=$(get_balance $BOB uusdc)
colineard tx colinearcore new-auction asdf asdf 2000 uusdc $(now + 3700) \ colineard tx colinearcore new-auction asdf asdf 2000 uusdc $(now + 3700) \
'[]' '["gtx-1050-ti"]' 4 0 1000 50 \
-y --from bob \ -y --from bob \
| expect_success "New auction is created" | expect_success "New auction is created"

View File

@ -17,7 +17,7 @@ colineard tx colinearcore lock-funds 550000000 -y --from bob \
| expect_success "Re-lock funds (Bob)" | expect_success "Re-lock funds (Bob)"
colineard tx colinearcore new-auction asdf asdf 200 uusdc $(now + 3700) \ colineard tx colinearcore new-auction asdf asdf 200 uusdc $(now + 3700) \
$ALICE \ '["'$ALICE'"]' '["gtx-1050-ti"]' 4 0 1000 50 \
-y --from bob \ -y --from bob \
| expect_success "New auction is created" | expect_success "New auction is created"

View File

@ -18,7 +18,7 @@ func CmdNewAuction() *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "new-auction [name] [description] [ceiling] [denom] [end date] [verified providers (json string)] [gpus (json string)] [cpu cores] [cpu arch] [memory (MB)] [storage (GB)]", Use: "new-auction [name] [description] [ceiling] [denom] [end date] [verified providers (json string)] [gpus (json string)] [cpu cores] [cpu arch] [memory (MB)] [storage (GB)]",
Short: "Broadcast message newAuction", Short: "Broadcast message newAuction",
Args: cobra.ExactArgs(10), Args: cobra.ExactArgs(11),
// below: we're hardcoding the max providers param since we // below: we're hardcoding the max providers param since we
// can't check chain params locally // can't check chain params locally
// Args: cobra.RangeArgs(10, 1010), // Args: cobra.RangeArgs(10, 1010),
@ -69,7 +69,6 @@ func CmdNewAuction() *cobra.Command {
if err != nil { if err != nil {
return err return err
} }
nMemMb, err := strconv.Atoi(memMb) nMemMb, err := strconv.Atoi(memMb)
if err != nil { if err != nil {
return err return err

View File

@ -89,6 +89,10 @@ found:
// remaining payout -> null // remaining payout -> null
// Remaining: "0", // Remaining: "0",
Gpus: msg.Gpus, Gpus: msg.Gpus,
CpuArch: msg.CpuArch,
CpuCores: msg.CpuCores,
MemMb: msg.MemMb,
StorageGb: msg.StorageGb,
} }
// validate hardware // validate hardware
@ -156,8 +160,8 @@ func (k *Keeper) ValidateAuctionHardware(ctx sdk.Context, a types.Auction) error
// move these to module params later // move these to module params later
if a.CpuCores == 0 || a.CpuCores > 12 { if a.CpuCores < 1 || a.CpuCores > 12 {
return errors.New("CPU Cores must be between 0 and 12") return fmt.Errorf("CPU Cores must be between 1 and 12 (got %d)", a.CpuCores)
} }
if a.StorageGb < 25 || a.StorageGb > 2000 { if a.StorageGb < 25 || a.StorageGb > 2000 {