Skip to content

Commit

Permalink
Merge pull request #26 from zenodeapp/genesis-v1.0.0
Browse files Browse the repository at this point in the history
Renamed cronosd folder to genesisd
  • Loading branch information
zenodeapp authored Jan 22, 2024
2 parents 9ec7118 + 1e31639 commit 87c9b2c
Show file tree
Hide file tree
Showing 16 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '^1.20.0'
go-version: "^1.20.0"
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v22
with:
Expand All @@ -48,7 +48,7 @@ jobs:
BUILD_TAGS=rocksdb,grocksdb_clean_link
echo "go build"
go build -tags $BUILD_TAGS ./cmd/cronosd
go build -tags $BUILD_TAGS ./cmd/genesisd
echo "golangci-lint ."
golangci-lint run --out-format=github-actions --path-prefix=./ --timeout 10m --build-tags $BUILD_TAGS
# Check only if there are differences in the source code
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ endif

all: build
build: check-network print-ledger go.sum
@go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR)/$(BINARY_NAME) ./cmd/cronosd
@go build -mod=readonly $(BUILD_FLAGS) -o $(BUILDDIR)/$(BINARY_NAME) ./cmd/$(BINARY_NAME)

install: check-network print-ledger go.sum
@go build -mod=readonly $(BUILD_FLAGS) -o $(BINDIR)/$(BINARY_NAME) ./cmd/cronosd
@go install -mod=readonly $(BUILD_FLAGS) ./cmd/$(BINARY_NAME)

test:
@go test -v -mod=readonly $(PACKAGES) -coverprofile=$(COVERAGE) -covermode=atomic
Expand Down
2 changes: 1 addition & 1 deletion app/prefix.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package app

import (
sdk "github.com/cosmos/cosmos-sdk/types"
cmdcfg "github.com/crypto-org-chain/cronos/cmd/cronosd/config"
cmdcfg "github.com/crypto-org-chain/cronos/cmd/genesisd/config"
ethcfg "github.com/evmos/ethermint/cmd/config"
)

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions cmd/cronosd/cmd/root.go → cmd/genesisd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
ethermint "github.com/evmos/ethermint/types"

"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/experimental"
"github.com/crypto-org-chain/cronos/cmd/cronosd/opendb"
"github.com/crypto-org-chain/cronos/cmd/genesisd/experimental"
"github.com/crypto-org-chain/cronos/cmd/genesisd/opendb"
memiavlcfg "github.com/crypto-org-chain/cronos/store/config"
"github.com/crypto-org-chain/cronos/x/cronos"
// this line is used by starport scaffolding # stargate/root/import
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sort"

"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/opendb"
"github.com/crypto-org-chain/cronos/cmd/genesisd/opendb"
versiondbclient "github.com/crypto-org-chain/cronos/versiondb/client"
"github.com/linxGnu/grocksdb"
"github.com/spf13/cobra"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/cronosd/main.go → cmd/genesisd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
"github.com/crypto-org-chain/cronos/app"
"github.com/crypto-org-chain/cronos/cmd/cronosd/cmd"
"github.com/crypto-org-chain/cronos/cmd/genesisd/cmd"
)

func main() {
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ buildGoApplication rec {
] ./.);
modules = ./gomod2nix.toml;
pwd = src; # needed to support replace
subPackages = [ "cmd/cronosd" ];
subPackages = [ "cmd/genesisd" ];
CGO_ENABLED = "1";
CGO_LDFLAGS =
if static then "-lrocksdb -pthread -lstdc++ -ldl -lzstd -lsnappy -llz4 -lbz2 -lz"
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/test_upgrade.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,4 @@ def test_cosmovisor_upgrade(custom_cronos: Cronos, tmp_path_factory):
file.write_text(json.dumps(genesis))
custom_cronos.supervisorctl("start", "cronos_777-1-node0", "cronos_777-1-node1")
wait_for_new_blocks(custom_cronos.cosmos_cli(), 1)
custom_cronos.supervisorctl("stop", "all")
custom_cronos.supervisorctl("stop", "all")

0 comments on commit 87c9b2c

Please sign in to comment.