Put the submodules in parent directories

This helps organize code a little better and also provides context to what "solidity-contracts" is
keep-network · Jul 12, 2023 · b195086 · b195086
1 parent aede19d
commit b195086
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "keep-core"]
-  path = keep-core
-  url = https://github.com/keep-network/keep-core.git
-[submodule "solidity-contracts"]
-	path = solidity-contracts
-	url = https://github.com/threshold-network/solidity-contracts
-[submodule "tbtc-v2"]
-	path = tbtc-v2
+[submodule "keep-network/keep-core"]
+	path = keep-network/keep-core
+	url = https://github.com/keep-network/keep-core
+[submodule "keep-network/tbtc-v2"]
+	path = keep-network/tbtc-v2
 	url = https://github.com/keep-network/tbtc-v2
+[submodule "threshold-network/solidity-contracts"]
+	path = threshold-network/solidity-contracts
+	url = https://github.com/threshold-network/solidity-contracts
diff --git a/Dockerfile.geth b/Dockerfile.geth
@@ -25,15 +25,15 @@ RUN apk add --update --no-cache bash git geth make gcc g++ && \
 # See: https://github.com/keep-network/tbtc-v2/blob/f53cb9ced50eaa8cfabcdf12cdcdc24a81a0ae11/.github/workflows/contracts.yml#L76-L80
 RUN git config --global url."https://".insteadOf git://
 
-COPY ./solidity-contracts /solidity-contracts
+COPY ./threshold-network/solidity-contracts /solidity-contracts
 WORKDIR /solidity-contracts
 RUN git init
 RUN yarn install
 RUN yarn build
 RUN yarn link
 RUN yarn prepack
 
-COPY ./keep-core /keep-core
+COPY ./keep-network/keep-core /keep-core
 WORKDIR /keep-core
 RUN git init
 
@@ -53,7 +53,7 @@ RUN yarn build
 RUN yarn link
 RUN yarn prepack
 
-COPY ./tbtc-v2 /tbtc-v2
+COPY ./keep-network/tbtc-v2 /tbtc-v2
 WORKDIR /tbtc-v2
 RUN git init
 WORKDIR /tbtc-v2/solidity

diff --git a/keep-core b/keep-core
diff --git a/keep-network/keep-core b/keep-network/keep-core
diff --git a/keep-network/tbtc-v2 b/keep-network/tbtc-v2
diff --git a/solidity-contracts b/solidity-contracts
diff --git a/tbtc-v2 b/tbtc-v2
diff --git a/threshold-network/solidity-contracts b/threshold-network/solidity-contracts