Removed BchAddress and SlpAddress models and their references

main/admin.py

@@ -3,8 +3,6 @@
     Token,
     Address,
     Transaction,
-    SlpAddress,
-    BchAddress,
     BlockHeight,
     Subscription,
     Recipient,
@@ -109,36 +107,6 @@ def resend_unacknowledged_transactions(self, request, queryset):
                     chat_id = platform[2]
                     send_telegram_message(message, chat_id)
 
-    # def get_queryset(self, request): 
-    #     # For Django < 1.6, override queryset instead of get_queryset
-    #     qs = super(TransactionAdmin, self).get_queryset(request) 
-    #     if request.user.is_superuser:
-    #         return qs
-    #     subscriber = Subscription.objects.filter(recipient=request.user)
-    #     if subscriber.exists():
-    #         obj = subscriber.first()
-    #         token_ids = obj.token.values_list('id',flat=True).distinct()
-    #         return Transaction.objects.filter(token__id__in=token_ids)
-    #     else:
-    #         return qs.filter(id=0)
-
-class SlpAddressAdmin(admin.ModelAdmin):
-    list_display = [
-        'address',
-    ]
-
-    exclude = [
-        'transactions',
-    ]
-
-class BchAddressAdmin(admin.ModelAdmin):
-    list_display = [
-        'address',
-    ]
-
-    exclude = [
-        'transactions',
-    ]
 
 class RecipientAdmin(admin.ModelAdmin):
     list_display = [
@@ -195,8 +163,6 @@ class ProjectAdmin(admin.ModelAdmin):
 
 admin.site.register(Token, TokenAdmin)
 admin.site.register(Transaction, TransactionAdmin)
-admin.site.register(SlpAddress, SlpAddressAdmin)
-admin.site.register(BchAddress, BchAddressAdmin)
 admin.site.register(BlockHeight, BlockHeightAdmin)
 admin.site.register(Subscription, SubscriptionAdmin)
 admin.site.register(Recipient, RecipientAdmin)

main/models.py

@@ -139,38 +139,6 @@ def __str__(self):
             return 'N/A'
 
 
-class SlpAddress(models.Model):
-    address = models.CharField(max_length=70, unique=True, db_index=True)
-    transactions = models.ManyToManyField(
-        Transaction,
-        related_name='slpaddress',
-        blank=True
-    )
-
-    class Meta:
-        verbose_name = 'SLP Address'
-        verbose_name_plural = 'SLP Addresses'
-
-    def __str__(self):
-        return self.address
-
-
-class BchAddress(models.Model):
-    address = models.CharField(max_length=70, unique=True, db_index=True)
-    transactions = models.ManyToManyField(
-        Transaction,
-        related_name='bchaddress',
-        blank=True
-    )
-
-    class Meta:
-        verbose_name = 'BCH Address'
-        verbose_name_plural = 'BCH Addresses'
-
-    def __str__(self):
-        return self.address
-
-
 class Address(models.Model):
     address = models.CharField(max_length=70, unique=True, db_index=True)
     project = models.ForeignKey(
@@ -193,6 +161,8 @@ class Address(models.Model):
     )
     date_created = models.DateTimeField(default=timezone.now)
 
+    class Meta:
+        verbose_name_plural = 'Addresses'
 
     def save(self, *args, **kwargs):
         if self.wallet and not self.wallet_type:
@@ -220,18 +190,4 @@ class Subscription(models.Model):
         blank=True,
         related_name='subscriptions'
     )
-    slp = models.ForeignKey(
-        SlpAddress,
-        on_delete=models.DO_NOTHING,
-        related_name='subscriptions',
-        null=True,
-        blank=True
-    )
-    bch = models.ForeignKey(
-        BchAddress,
-        on_delete=models.DO_NOTHING,
-        related_name='subscriptions',
-        null=True,
-        blank=True
-    )
     websocket=models.BooleanField(default=False)

main/tasks.py

@@ -6,7 +6,6 @@
     Token, 
     Transaction,
     SlpAddress,
-    BchAddress,
     Recipient,
     Subscription
 )
@@ -219,14 +218,6 @@ def save_record(token, transaction_address, transactionid, amount, source, block
             # Trigger post save signals
             transaction_obj.save()
 
-        if token == 'bch':
-            address_obj, created = BchAddress.objects.get_or_create(address=transaction_address)
-        else:
-            address_obj, created = SlpAddress.objects.get_or_create(address=transaction_address)
-
-        address_obj.transactions.add(transaction_obj)
-        address_obj.save()
-
         return transaction_obj.id, transaction_created
 
 

main/urls.py

@@ -8,11 +8,6 @@
 
 
 router = routers.DefaultRouter()
-# router.register(r"slp_address", views.SlpAddressViewSet)
-# router.register(r"token", views.TokenViewSet)
-# router.register(r"transaction", views.TransactionViewSet)
-# router.register(r"auth", views.AuthViewSet,basename='auth')
-# path('set-address/', SetAddressView.as_view(), name='setaddress'),
 
 main_urls = router.urls
 

main/utils/subscription.py

@@ -1,4 +1,4 @@
-from main.models import Token,BchAddress, Subscription, SlpAddress, Recipient
+from main.models import Token, Subscription, Recipient
 from django.conf import settings
 from django.db import transaction as trans
 from django.db.models import Q

tests/system/objects/obj_save_record.py

@@ -1,6 +1,6 @@
 from main import tasks
 import json
-from main.models import BlockHeight, Token, Transaction, SlpAddress, Subscription, BchAddress, SendTo
+from main.models import BlockHeight, Token, Transaction, Address, Subscription, SendTo
 
 class SaveRecordTest(object):
 	txid = None
@@ -19,10 +19,7 @@ def test(self, *args, **kwargs):
 		if args[5] is not None:
 			blockheight = BlockHeight.objects.get(id=args[5])
 			assert blockheight
-		if args[0] == 'bch':
-			address = BchAddress.objects.get(address=args[1])
-		else:
-			address = SlpAddress.object.get(address=args[1])
+		address = Address.objects.get(address=args[1])
 		assert address
 		self.txid = transaction.txid
 		self.address = address.address