Skip to content
This repository has been archived by the owner on Jun 9, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into top-of-block
Browse files Browse the repository at this point in the history
  • Loading branch information
itsdevbear authored Sep 22, 2023
2 parents 4fe840a + 6a92c39 commit e15fe01
Show file tree
Hide file tree
Showing 29 changed files with 184 additions and 700 deletions.
3 changes: 3 additions & 0 deletions cosmos/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ func ReadConfigFromAppOpts(opts servertypes.AppOptions) (*Config, error) {
if conf.Node.DataDir, err = getString(flagDataDir); err != nil {
return nil, handleError(err)
}
if conf.Node.DataDir == "" {
conf.Node.DataDir = node.DefaultDataDir()
}
if conf.Node.KeyStoreDir, err = getString(flagKeyStoreDir); err != nil {
return nil, handleError(err)
}
Expand Down
27 changes: 27 additions & 0 deletions cosmos/lib/codec.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// SPDX-License-Identifier: BUSL-1.1
//
// Copyright (C) 2023, Berachain Foundation. All rights reserved.
// Use of this software is govered by the Business Source License included
// in the LICENSE file of this repository and at www.mariadb.com/bsl11.
//
// ANY USE OF THE LICENSED WORK IN VIOLATION OF THIS LICENSE WILL AUTOMATICALLY
// TERMINATE YOUR RIGHTS UNDER THIS LICENSE FOR THE CURRENT AND ALL OTHER
// VERSIONS OF THE LICENSED WORK.
//
// THIS LICENSE DOES NOT GRANT YOU ANY RIGHT IN ANY TRADEMARK OR LOGO OF
// LICENSOR OR ITS AFFILIATES (PROVIDED THAT YOU MAY USE A TRADEMARK OR LOGO OF
// LICENSOR AS EXPRESSLY REQUIRED BY THIS LICENSE).
//
// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
// AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
// TITLE.

package lib

import "cosmossdk.io/core/address"

type CodecProvider interface {
AddressCodec() address.Codec
}
133 changes: 0 additions & 133 deletions cosmos/lib/trees/btree.go

This file was deleted.

224 changes: 0 additions & 224 deletions cosmos/lib/trees/btree_test.go

This file was deleted.

Loading

0 comments on commit e15fe01

Please sign in to comment.