From 2cf07ccba93c45d62843e643b42a7d38f96b75bf Mon Sep 17 00:00:00 2001
From: aazhou <aazhou@protonmail.com>
Date: Mon, 19 Jun 2023 22:07:58 +0800
Subject: [PATCH] update project in

---
 main.py                                              | 12 ++++++------
 .../large_trans.py => monitors/large_transfer.py     |  2 +-
 {strategy => signals}/ma_arrangement.py              |  2 +-
 strategy_test.py                                     |  6 +++---
 test.py                                              |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename strategy/large_trans.py => monitors/large_transfer.py (98%)
 rename {strategy => signals}/ma_arrangement.py (97%)

diff --git a/main.py b/main.py
index 28741ee..ea314f9 100644
--- a/main.py
+++ b/main.py
@@ -2,24 +2,24 @@ import schedule
 import bn
 import settings
 import time
-import strategy.ma_arrangement as maa
-import strategy.large_trans as lt
+import signals.ma_arrangement as maa
+import monitors.large_transfer as lt
 
 # 获取交易所交易对
 symbols = bn.symbols()
 
 for s in symbols:
     #15m
-    schedule.every(15).minutes.do(maa.strategy_run, symbol=s, interval='15m')
+    schedule.every(15).minutes.do(maa.run, symbol=s, interval='15m')
 
     #1h
-    schedule.every(1).hours.do(maa.strategy_run, symbol=s, interval='1h')
+    schedule.every(1).hours.do(maa.run, symbol=s, interval='1h')
 
     #4h
-    schedule.every(4).hours.do(maa.strategy_run, symbol=s, interval='4h')
+    schedule.every(4).hours.do(maa.run, symbol=s, interval='4h')
 
 # 监控
-schedule.every(settings.whaleAlert_minutes).minutes.do(lt.strategy_run)
+schedule.every(settings.whaleAlert_minutes).minutes.do(lt.run)
 
 print(f'Running... ChatID: {settings.chat_id}')
 while True:
diff --git a/strategy/large_trans.py b/monitors/large_transfer.py
similarity index 98%
rename from strategy/large_trans.py
rename to monitors/large_transfer.py
index c943911..8bbd297 100644
--- a/strategy/large_trans.py
+++ b/monitors/large_transfer.py
@@ -8,7 +8,7 @@ import traceback
 import logging
 
 
-def strategy_run():
+def run():
     try:
         start_time = datetime.now() - timedelta(minutes=settings.whaleAlert_minutes)
         start_ts = int(start_time.timestamp())
diff --git a/strategy/ma_arrangement.py b/signals/ma_arrangement.py
similarity index 97%
rename from strategy/ma_arrangement.py
rename to signals/ma_arrangement.py
index 1dd16a6..af2368b 100644
--- a/strategy/ma_arrangement.py
+++ b/signals/ma_arrangement.py
@@ -22,7 +22,7 @@ def check_ma_arrange(data):
     return bullish, bearish
     
 
-def strategy_run(symbol, interval):
+def run(symbol, interval):
     # 获取kline数据
     data = bn.klines(symbol, interval)
 
diff --git a/strategy_test.py b/strategy_test.py
index 0be11c8..46a55e4 100644
--- a/strategy_test.py
+++ b/strategy_test.py
@@ -1,8 +1,8 @@
-import strategy.large_trans as lt
+import monitors.large_transfer as lt
 import bn
-import strategy.ma_arrangement as maa
+import signals.ma_arrangement as maa
 
 # symbols = bn.symbols()
 
 # for s in symbols:
-maa.strategy_run('LINKUSDT', '15m')
\ No newline at end of file
+maa.run('LINKUSDT', '15m')
\ No newline at end of file
diff --git a/test.py b/test.py
index 8b8fe73..c6c0fa7 100644
--- a/test.py
+++ b/test.py
@@ -2,7 +2,7 @@ import bn
 import pandas as pd
 import mplfinance as mpf
 import datetime as dt
-import strategy.large_trans as lt
+import monitors.large_transfer as lt
 
 
 klines = bn.klines('BTCUSDT', '1h', limit=10)