Merge branch 'master' into cleanup-github-project

inflector · Dec 8, 2017 · 7eba857 · 7eba857
2 parents b0cfb93 + 53956ca
commit 7eba857
Show file tree

Hide file tree

Showing 22 changed files with 6 additions and 6,528 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "agent/sn_agent/network/ethereum/core"]
+	path = agent/sn_agent/network/ethereum/core
+	url = https://github.com/singnet/core
diff --git a/agent/sn_agent/accounting/__init__.py b/agent/sn_agent/accounting/__init__.py
@@ -11,7 +11,7 @@
 from sn_agent.accounting.settings import AccountingSettings
 from sn_agent.api import internal_perform_job
 from sn_agent.job.job_descriptor import JobDescriptor
-from sn_agent.network.sn import MarketJob
+from sn_agent.network.ethereum.__init__ import MarketJob
 
 
 class PriceTooLowException(Exception):

diff --git a/agent/sn_agent/network/sn.py → agent/sn_agent/network/ethereum/__init__.py b/agent/sn_agent/network/sn.py → agent/sn_agent/network/ethereum/__init__.py
diff --git a/agent/sn_agent/network/ethereum/core b/agent/sn_agent/network/ethereum/core
diff --git a/...t/sn_agent/network/data/AgentFactory.json → ...t/network/ethereum/data/AgentFactory.json b/...t/sn_agent/network/data/AgentFactory.json → ...t/network/ethereum/data/AgentFactory.json
diff --git a/.../sn_agent/network/data/AgentRegistry.json → .../network/ethereum/data/AgentRegistry.json b/.../sn_agent/network/data/AgentRegistry.json → .../network/ethereum/data/AgentRegistry.json
diff --git a/agent/sn_agent/network/data/MarketJob.json → ...gent/network/ethereum/data/MarketJob.json b/agent/sn_agent/network/data/MarketJob.json → ...gent/network/ethereum/data/MarketJob.json
diff --git a/agent/sn_agent/network/data/addresses.json → ...gent/network/ethereum/data/addresses.json b/agent/sn_agent/network/data/addresses.json → ...gent/network/ethereum/data/addresses.json
diff --git a/...ent/network/data/agent_to_url_lookup.json → ...rk/ethereum/data/agent_to_url_lookup.json b/...ent/network/data/agent_to_url_lookup.json → ...rk/ethereum/data/agent_to_url_lookup.json
diff --git a/agent/sn_agent/network/settings.py b/agent/sn_agent/network/settings.py
@@ -19,7 +19,7 @@ def __init__(self, **custom_settings):
         self.CLIENT_URL = 'http://testrpc:8545'
         self.ACCOUNT_PASSWORD = Required(str)
 
-        self.CLASS = 'sn_agent.network.sn.SNNetwork'
+        self.CLASS = 'sn_agent.network.ethereum.SNNetwork'
 
         self.WEB_HOST = "0.0.0.0"
         self.WEB_PORT = 8000

diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml
diff --git a/geth/Dockerfile b/geth/Dockerfile
diff --git a/geth/config.toml b/geth/config.toml
diff --git a/geth/geth.sh b/geth/geth.sh
diff --git a/geth/password.txt b/geth/password.txt
diff --git a/ipfs/Dockerfile b/ipfs/Dockerfile
diff --git a/ipfs/hello.txt b/ipfs/hello.txt
diff --git a/ipfs/index.js b/ipfs/index.js