Browse Source

fix jmdaemon refs

master
Adam Gibson 9 years ago
parent
commit
47f65be620
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 6
      jmdaemon/irc.py
  2. 2
      jmdaemon/message_channel.py
  3. 4
      jmdaemon/orderbookwatch.py
  4. 4
      joinmarketd.py

6
jmdaemon/irc.py

@ -9,10 +9,10 @@ import time
import Queue import Queue
from daemon.message_channel import MessageChannel from jmdaemon.message_channel import MessageChannel
from jmbase.support import get_log, chunks from jmbase.support import get_log, chunks
from daemon.socks import socksocket, setdefaultproxy, PROXY_TYPE_SOCKS5 from jmdaemon.socks import socksocket, setdefaultproxy, PROXY_TYPE_SOCKS5
from daemon.protocol import * from jmdaemon.protocol import *
MAX_PRIVMSG_LEN = 450 MAX_PRIVMSG_LEN = 450
PING_INTERVAL = 300 PING_INTERVAL = 300
PING_TIMEOUT = 60 PING_TIMEOUT = 60

2
jmdaemon/message_channel.py

@ -1,7 +1,7 @@
#! /usr/bin/env python #! /usr/bin/env python
from __future__ import print_function from __future__ import print_function
import base64, abc, threading, time import base64, abc, threading, time
from daemon import ( from jmdaemon import (
encrypt_encode, decode_decrypt, COMMAND_PREFIX, ORDER_KEYS, encrypt_encode, decode_decrypt, COMMAND_PREFIX, ORDER_KEYS,
NICK_HASH_LENGTH, NICK_MAX_ENCODED, JM_VERSION, JOINMARKET_NICK_HEADER, NICK_HASH_LENGTH, NICK_MAX_ENCODED, JM_VERSION, JOINMARKET_NICK_HEADER,
nickname, plaintext_commands, encrypted_commands, commitment_broadcast_list, nickname, plaintext_commands, encrypted_commands, commitment_broadcast_list,

4
jmdaemon/orderbookwatch.py

@ -11,9 +11,9 @@ import threading
import json import json
from decimal import InvalidOperation, Decimal from decimal import InvalidOperation, Decimal
from daemon.protocol import JM_VERSION from jmdaemon.protocol import JM_VERSION
from jmbase.support import get_log, joinmarket_alert, DUST_THRESHOLD from jmbase.support import get_log, joinmarket_alert, DUST_THRESHOLD
from daemon.irc import B_PER_SEC from jmdaemon.irc import B_PER_SEC
log = get_log() log = get_log()

4
joinmarketd.py

@ -1,13 +1,13 @@
#! /usr/bin/env python #! /usr/bin/env python
from __future__ import print_function from __future__ import print_function
import sys import sys
from daemon import (IRCMessageChannel, MessageChannelCollection, from jmdaemon import (IRCMessageChannel, MessageChannelCollection,
OrderbookWatch, as_init_encryption, init_pubkey, OrderbookWatch, as_init_encryption, init_pubkey,
NaclError, init_keypair, COMMAND_PREFIX, ORDER_KEYS, NaclError, init_keypair, COMMAND_PREFIX, ORDER_KEYS,
NICK_HASH_LENGTH, NICK_MAX_ENCODED, JM_VERSION, NICK_HASH_LENGTH, NICK_MAX_ENCODED, JM_VERSION,
JOINMARKET_NICK_HEADER) JOINMARKET_NICK_HEADER)
from base.commands import * from jmbase.commands import *
from twisted.protocols import amp from twisted.protocols import amp
from twisted.internet import reactor from twisted.internet import reactor
from twisted.internet.protocol import ServerFactory from twisted.internet.protocol import ServerFactory

Loading…
Cancel
Save