Skip to content

Commit f4bfb0f

Browse files
Remove apm (#2969)
* update granite dependencies * remove apm * remove apm * update version * update version url * verified granite * update latest.json * update sig agg * update sig agg * lint * lint * fix go mod --------- Signed-off-by: sukantoraymond <rsukanto@umich.edu>
1 parent f4e202a commit f4bfb0f

File tree

27 files changed

+332
-2750
lines changed

27 files changed

+332
-2750
lines changed

cmd/blockchaincmd/blockchain.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,8 @@ manage your Blockchain configurations and live deployments.`,
4444
cmd.AddCommand(newExportCmd())
4545
// blockchain import
4646
cmd.AddCommand(newImportCmd())
47-
// blockchain publish
48-
cmd.AddCommand(newPublishCmd())
4947
// blockchain upgrade
5048
cmd.AddCommand(upgradecmd.NewCmd(app))
51-
// blockchain stats
52-
cmd.AddCommand(newStatsCmd())
5349
// blockchain configure
5450
cmd.AddCommand(newConfigureCmd())
5551
// blockchain VMID

cmd/blockchaincmd/create.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ import (
1212
"strings"
1313
"unicode"
1414

15+
"github.com/ava-labs/subnet-evm/params/extras"
16+
1517
"github.com/ava-labs/avalanche-cli/cmd/flags"
1618
"github.com/ava-labs/avalanche-cli/pkg/cobrautils"
1719
"github.com/ava-labs/avalanche-cli/pkg/constants"
@@ -513,7 +515,10 @@ func sendMetrics(repoName, blockchainName string) error {
513515
if err != nil {
514516
return err
515517
}
516-
conf := params.GetExtra(genesis.Config).GenesisPrecompiles
518+
var conf extras.Precompiles
519+
params.WithTempRegisteredExtras(func() {
520+
conf = params.GetExtra(genesis.Config).GenesisPrecompiles
521+
})
517522
precompiles := make([]string, 0, 6)
518523
for precompileName := range conf {
519524
precompileTag := "precompile-" + precompileName

cmd/blockchaincmd/deploy.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,14 +1175,13 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
11751175
deployRelayerFlags.CChainFundingKey = "ewoq"
11761176
deployRelayerFlags.CChainAmount = constants.DefaultRelayerAmount
11771177
}
1178-
if network.Kind == models.Granite {
1179-
deployRelayerFlags.BlockchainsToRelay = []string{blockchainName}
1180-
}
1181-
if err := relayercmd.CallDeploy(nil, deployRelayerFlags, network); err != nil {
1182-
relayerErr = err
1183-
ux.Logger.RedXToUser("Relayer is not deployed due to: %v", relayerErr)
1184-
} else {
1185-
ux.Logger.GreenCheckmarkToUser("Relayer is successfully deployed")
1178+
if network.Kind != models.Granite {
1179+
if err := relayercmd.CallDeploy(nil, deployRelayerFlags, network); err != nil {
1180+
relayerErr = err
1181+
ux.Logger.RedXToUser("Relayer is not deployed due to: %v", relayerErr)
1182+
} else {
1183+
ux.Logger.GreenCheckmarkToUser("Relayer is successfully deployed")
1184+
}
11861185
}
11871186
}
11881187
}

cmd/blockchaincmd/import.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ or importing from blockchains running public networks
1919
(e.g. created manually or with the deprecated subnet-cli)`,
2020
RunE: cobrautils.CommandSuiteUsage,
2121
}
22-
// blockchain import file
23-
cmd.AddCommand(newImportFileCmd())
2422
// blockchain import public
2523
cmd.AddCommand(newImportPublicCmd())
2624
return cmd

0 commit comments

Comments
 (0)