Skip to content

Commit 1432291

Browse files
astaphobiaastaphobia
authored
Remove badger db (#1162)
* initiate receipt reminder storage * remove unused codes * fix nil allocation of map * receipt reminder only need receipt key and chaintype * fnished mempool backup and receipt reminder cache storage * fnished mempool backup and receipt reminder cache storage * remove println code and remove badger db from go.mod * fix warning line exceded * remove badger key from config.toml * Update loadConfig to let nomad pass a full path to resource folder * Node status (#1170) * update healthcheck service : add node status endpoint * Fix case query between usage (#1173) * sort genesis transactions for consistent genesis block hash and id (#1174) * Genesis generate command refactoring (#1169) * Add genesisTimestamp flag and updated genesis templates * Add logic to validate input data files used to generate genesis.go * Exclude from node seed verification all entries that don't have a node seed, but only node public key and account address (we can't verify them using genesis generate)
1 parent 52c31cd commit 1432291

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+554
-1175
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ release-cmd: cmd-linux
120120

121121
.PHONY: reset-data
122122
reset-data:
123-
rm -rf resource/*db resource/*kv resource/snapshots*
123+
rm -rf resource/*db resource/snapshots*

‎cmd/block/blockGenerator.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,19 @@ package block
22

33
import (
44
"fmt"
5-
"github.com/zoobc/zoobc-core/common/auth"
65
"strings"
76
"time"
87

9-
"github.com/zoobc/zoobc-core/common/storage"
10-
118
log "github.com/sirupsen/logrus"
129
"github.com/spf13/cobra"
13-
10+
"github.com/zoobc/zoobc-core/common/auth"
1411
"github.com/zoobc/zoobc-core/common/chaintype"
1512
"github.com/zoobc/zoobc-core/common/crypto"
1613
"github.com/zoobc/zoobc-core/common/database"
1714
"github.com/zoobc/zoobc-core/common/fee"
1815
"github.com/zoobc/zoobc-core/common/model"
1916
"github.com/zoobc/zoobc-core/common/query"
17+
"github.com/zoobc/zoobc-core/common/storage"
2018
"github.com/zoobc/zoobc-core/common/transaction"
2119
"github.com/zoobc/zoobc-core/core/service"
2220
"github.com/zoobc/zoobc-core/core/smith"
@@ -132,18 +130,17 @@ func initialize(
132130
query.NewMerkleTreeQuery(),
133131
query.NewNodeRegistrationQuery(),
134132
query.NewBlockQuery(chainType),
135-
nil,
136133
queryExecutor,
137134
nodeRegistrationService,
138135
crypto.NewSignature(),
139136
nil,
140137
receiptUtil,
141138
nil,
139+
nil,
142140
)
143141
mempoolService := service.NewMempoolService(
144142
transactionUtil,
145143
chainType,
146-
nil,
147144
queryExecutor,
148145
query.NewMempoolQuery(chainType),
149146
query.NewMerkleTreeQuery(),
@@ -158,6 +155,7 @@ func initialize(
158155
nil,
159156
blockStorage,
160157
mempoolStorage,
158+
nil,
161159
)
162160
nodeRegistrationService := service.NewNodeRegistrationService(
163161
queryExecutor,
@@ -188,7 +186,6 @@ func initialize(
188186
)
189187
blockService = service.NewBlockMainService(
190188
chainType,
191-
nil,
192189
queryExecutor,
193190
query.NewBlockQuery(chainType),
194191
query.NewMempoolQuery(chainType),

‎cmd/configure/cmd.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ func generateConfig(config model.Config) error {
196196
config.Smithing = true
197197
config.ResourcePath = "./resource"
198198
config.DatabaseFileName = "zoobc.db"
199-
config.BadgerDbName = "zoobc_kv"
200199
config.CliMonitoring = true
201200
config.SnapshotPath = "./resource/snapshots"
202201

‎cmd/genesisblock/cmd.go

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"database/sql"
66
"encoding/json"
77
"fmt"
8-
"github.com/zoobc/zoobc-core/common/auth"
9-
"github.com/zoobc/zoobc-core/common/storage"
108
"io/ioutil"
119
"log"
1210
"os"
@@ -15,16 +13,16 @@ import (
1513
"text/template"
1614
"time"
1715

18-
"github.com/zoobc/lib/address"
19-
2016
"github.com/spf13/cobra"
21-
17+
"github.com/zoobc/lib/address"
18+
"github.com/zoobc/zoobc-core/common/auth"
2219
"github.com/zoobc/zoobc-core/common/chaintype"
2320
"github.com/zoobc/zoobc-core/common/constant"
2421
"github.com/zoobc/zoobc-core/common/crypto"
2522
"github.com/zoobc/zoobc-core/common/database"
2623
"github.com/zoobc/zoobc-core/common/model"
2724
"github.com/zoobc/zoobc-core/common/query"
25+
"github.com/zoobc/zoobc-core/common/storage"
2826
"github.com/zoobc/zoobc-core/common/transaction"
2927
"github.com/zoobc/zoobc-core/common/util"
3028
"github.com/zoobc/zoobc-core/core/service"
@@ -515,7 +513,6 @@ func getGenesisBlockID(genesisEntries []genesisEntry) (mainBlockID, spineBlockID
515513
nil,
516514
nil,
517515
nil,
518-
nil,
519516
&transaction.TypeSwitcher{
520517
MempoolCacheStorage: mempoolStorage,
521518
NodeAuthValidation: nodeAuthValidationService,
@@ -547,7 +544,21 @@ func getGenesisBlockID(genesisEntries []genesisEntry) (mainBlockID, spineBlockID
547544
if err != nil {
548545
log.Fatal(err)
549546
}
550-
sb := service.NewBlockSpineService(&chaintype.SpineChain{}, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil)
547+
sb := service.NewBlockSpineService(
548+
&chaintype.SpineChain{},
549+
nil,
550+
nil,
551+
nil,
552+
nil,
553+
nil,
554+
nil,
555+
nil,
556+
nil,
557+
nil,
558+
nil,
559+
nil,
560+
nil,
561+
)
551562
spine, err := sb.GenerateGenesisBlock(genesisConfig)
552563
if err != nil {
553564
log.Fatal(err)

‎cmd/snapshot/snapshot.go

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@ package snapshot
22

33
import (
44
"database/sql"
5-
"github.com/zoobc/zoobc-core/common/auth"
6-
"github.com/zoobc/zoobc-core/common/crypto"
75
"math/rand"
86
"os"
97

108
"github.com/sirupsen/logrus"
119
"github.com/spf13/cobra"
1210
"github.com/ugorji/go/codec"
13-
"golang.org/x/crypto/sha3"
14-
11+
"github.com/zoobc/zoobc-core/common/auth"
1512
"github.com/zoobc/zoobc-core/common/chaintype"
1613
"github.com/zoobc/zoobc-core/common/constant"
14+
"github.com/zoobc/zoobc-core/common/crypto"
1715
"github.com/zoobc/zoobc-core/common/database"
1816
"github.com/zoobc/zoobc-core/common/model"
1917
"github.com/zoobc/zoobc-core/common/query"
2018
"github.com/zoobc/zoobc-core/common/storage"
2119
"github.com/zoobc/zoobc-core/common/transaction"
2220
"github.com/zoobc/zoobc-core/core/service"
21+
"golang.org/x/crypto/sha3"
2322
)
2423

2524
func init() {
@@ -254,12 +253,36 @@ func storingPayloadProcess() func(ccmd *cobra.Command, args []string) {
254253
}
255254
mainBlockService := service.NewBlockMainService(
256255
mainChain,
257-
nil,
258256
executor,
259257
query.NewBlockQuery(mainChain),
260-
nil, nil, nil, nil, nil, nil, nil,
258+
nil,
259+
nil,
260+
nil,
261+
nil,
262+
nil,
263+
nil,
264+
nil,
261265
typeSwitcher,
262-
nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil,
266+
nil,
267+
nil,
268+
nil,
269+
nil,
270+
nil,
271+
nil,
272+
nil,
273+
nil,
274+
nil,
275+
nil,
276+
nil,
277+
nil,
278+
nil,
279+
nil,
280+
nil,
281+
nil,
282+
nil,
283+
nil,
284+
nil,
285+
nil,
263286
storage.NewBlockStateStorage(),
264287
nil,
265288
)

‎common/constant/kvdb.go

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎common/database/badgerdb.go

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)