make btPeer global to nft package

bluzelle · Aug 12, 2021 · ca4d3f8 · ca4d3f8
1 parent cc1a1bb
commit ca4d3f8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/x/nft/keeper/createNft.go b/x/nft/keeper/createNft.go
@@ -15,7 +15,7 @@ import (
 
 
 func (k Keeper) SeedFile(metainfo *metainfo.MetaInfo) error {
-	err := k.btClient.SeedFile(metainfo)
+	err := k.GetBtClient().SeedFile(metainfo)
 	if err != nil {
 		return err
 	}

diff --git a/x/nft/keeper/keeper.go b/x/nft/keeper/keeper.go
@@ -15,6 +15,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	"os"
 )
+var btClient *torrentClient.TorrentClient
 
 type (
 	Keeper struct {
@@ -27,7 +28,7 @@ type (
 		MsgBroadcaster curium.MsgBroadcaster
 		curiumKeeper   *curium.Keeper
 		KeyringReader *keeper.KeyringReader
-		btClient      *torrentClient.TorrentClient
+		BtClient      *torrentClient.TorrentClient
 	}
 )
 
@@ -58,11 +59,11 @@ func NewKeeper (
 }
 
 func (k Keeper) GetBtClient() (*torrentClient.TorrentClient) {
-	return k.btClient
+	return btClient
 }
 
-func (k Keeper) SetBtClient(btClient *torrentClient.TorrentClient) {
-	k.btClient = btClient
+func (k Keeper) SetBtClient(newBtClient *torrentClient.TorrentClient) {
+	btClient = newBtClient
 }
 
 func (k Keeper) GetCdc() *codec.Codec {

diff --git a/x/nft/module.go b/x/nft/module.go
@@ -145,7 +145,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context) json.RawMessage {
 func (am AppModule) BeginBlock(_ sdk.Context, req abci.RequestBeginBlock) {
 }
 
-var registerPeerOnce sync.Once
+var once sync.Once
 // EndBlock returns the end blocker for the nft module. It returns no validator
 // updates.
 func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate {
@@ -155,7 +155,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 	if err != nil {
 		am.keeper.Logger(ctx).Error("nft user does not exist in keyring", "nft", err)
 	} else {
-		registerPeerOnce.Do(func () {
+		once.Do(func () {
 
 			btClient, err := torrentClient.NewTorrentClient(am.btDirectory, am.btPort)
 			fmt.Println("Torrent client created", *btClient)
@@ -167,7 +167,7 @@ func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.Val
 
 			am.keeper.SetBtClient(btClient)
 
-			fmt.Println("Bt client after setting", am.keeper.GetBtClient())
+			fmt.Println("Bt client after setting", am.keeper.BtClient, am.keeper.GetBtClient())
 
 
 			fmt.Println("Doing broadcast register peer")