Skip to content

Commit 262e296

Browse files
authored
Merge pull request #1516 from 0chain/fix/txn-processing
Fix/txn processing
2 parents cdcf01d + 75a57a6 commit 262e296

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

code/go/0chain.net/blobber/zcn.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,16 @@ func setupServerChain() error {
8383
serverChain := chain.NewChainFromConfig()
8484
chain.SetServerChain(serverChain)
8585

86+
//options := []int{
87+
// 0,
88+
// 10, // MinConfirmation
89+
// 20, // MinSubmit
90+
// 3, // ConfirmationChainLength
91+
// 3, // SharderConsensous
92+
// 1, // QuerySleepTime
93+
// 0, // VerifyOptimistic
94+
//}
95+
8696
err := client.InitSDK("{}", serverChain.BlockWorker, config.Configuration.ChainID, config.Configuration.SignatureScheme, 0, false)
8797
if err != nil {
8898
return err
@@ -93,10 +103,6 @@ func setupServerChain() error {
93103
return err
94104
}
95105

96-
if client.GetClient().IsSplit {
97-
zcncore.RegisterZauthServer(serverChain.ZauthServer)
98-
}
99-
100106
fmt.Print(" [OK]\n")
101107
return nil
102108
}

code/go/0chain.net/core/chain/entity.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func NewChainFromConfig() *Chain {
5151
chain.ID = common.ToKey(config.Configuration.ChainID)
5252
chain.OwnerID = viper.GetString("server_chain.owner")
5353
chain.BlockWorker = viper.GetString("block_worker")
54-
chain.ZauthServer = viper.GetString("zauth_server")
5554
return chain
5655
}
5756

code/go/0chain.net/validator/main.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,6 @@ func SetupValidatorOnBC(logDir string) error {
243243
return err
244244
}
245245

246-
if client.GetClient().IsSplit {
247-
zcncore.RegisterZauthServer(serverChain.ZauthServer)
248-
}
249-
250246
go RegisterValidator()
251247

252248
return nil

0 commit comments

Comments
 (0)