Skip to content

Commit 604cfb7

Browse files
committed
Revert "Update mining chain sync functions"
This reverts commit 58cb902, reversing changes made to 512fcda.
1 parent 58cb902 commit 604cfb7

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

block/mining_chain.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ type MiningChain struct {
1414
}
1515

1616
const (
17-
RubixMiningChainIDString string = "RUBIX_MINING_CHAIN_TEST_PART_1"
18-
RubixMiningChainID string = "QmZBygVYVKfp8T8epK9sEyYYU1MzqKbyTcUMAmqosUtQnK"
17+
RubixMiningChainIDString string = "rubix_mining_chain_test_"
18+
RubixMiningChainID string = "QmT4HbZiQU6QXvVFvrKH6HSLP4PdxbVBDsseCr6jXq9AMM"
1919
)
2020

2121
const (

core/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const (
7575
TestNetDir string = "TestNet"
7676
TestNetDIDDir string = "TestNetDID/"
7777
MaxDecimalPlaces int = 3
78-
AddressForMiningChainSync string = "12D3KooWMLD1bdHLgnDBPQFmm2uDeqi2fgfYvpUEixYavFUgdj7e.bafybmic3qz5nsz25eymi3ruunueyjb5btxiog3utxyqz6nhyqow2egdmf4"
78+
AddressForMiningChainSync string = "12D3KooWGppoT2BwPddMG3uLdwAar2b5yuFG1KCviELYtoFuQPAs" //bafybmib6gtwq7kqlvfqzi4sbv7fpxuwp3smjro5bujtbckaajkbdkls3b4
7979
)
8080

8181
const (

core/mine.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,7 @@ func (c *Core) miningCallback(peerID string, topic string, data []byte) {
248248
c.log.Error("Failed to parse mining callback data", "err", err)
249249
return
250250
}
251-
minerAddressForSync := fmt.Sprintf("%s.%s", miningData.MinerPeerID, miningData.MinerDID)
252-
fmt.Println(minerAddressForSync)
253-
err = c.SyncMiningChain(minerAddressForSync)
251+
err = c.SyncMiningChain(miningData.MinerPeerID)
254252
if err != nil {
255253
c.log.Error("Failed to get Rubix mining chain ID")
256254
}

core/token.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,15 +1597,15 @@ func (c *Core) SyncLatestTokenChains(tokenTokenTypeMap map[string]int) error {
15971597
return lastErr
15981598
}
15991599

1600-
func (c *Core) SyncMiningChain(address string) error {
1601-
peer, err := c.getPeer(address)
1600+
func (c *Core) SyncMiningChain(peerID string) error {
1601+
peer, err := c.getPeer(peerID)
16021602
if err != nil {
16031603
c.log.Error("Failed to get peer", "err", err)
16041604
return err
16051605
}
16061606

16071607
var miningChainSyncresp MiningChainSyncReply
1608-
err = peer.SendJSONRequest("GET", APISyncMiningChain, nil, "", &miningChainSyncresp, false)
1608+
err = peer.SendJSONRequest("POST", APISyncMiningChain, nil, "", &miningChainSyncresp, false)
16091609
if err != nil {
16101610
c.log.Error("Failed to sync token chain block", "err", err)
16111611
return err

core/wallet/mine.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ func (w *Wallet) GetAllMiningChainBlocks(token string, startBlockNumber uint64)
191191
count++
192192
nextBlockNumber = blockNumber + 1
193193
iter.Next()
194+
fmt.Println("Got mining chain block:", blockNumber)
194195
}
195196

196197
if !iter.Valid() {

0 commit comments

Comments
 (0)