Add TidalProtocol submodule & restructure internal dependencies

.gitmodules

@@ -1,3 +1,8 @@
-[submodule "DeFiBlocks"]
-	path = DeFiBlocks
-	url = git@github.com:onflow/DeFiBlocks.git
+[submodule "lib/DeFiBlocks"]
+	path = lib/DeFiBlocks
+	url = https://github.com/onflow/DeFiBlocks.git
+	branch = main
+[submodule "lib/TidalProtocol"]
+	path = lib/TidalProtocol
+	url = https://github.com/onflow/TidalProtocol.git
+	branch = gio/refactor-pool-creation-updated

cadence/tests/test_helpers.cdc

@@ -27,25 +27,25 @@ access(all) fun deployContracts() {
     // DeFiBlocks contracts
     var err = Test.deployContract(
         name: "DFBUtils",
-        path: "../../DeFiBlocks/cadence/contracts/utils/DFBUtils.cdc",
+        path: "../../lib/DeFiBlocks/cadence/contracts/utils/DFBUtils.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "DFB",
-        path: "../../DeFiBlocks/cadence/contracts/interfaces/DFB.cdc",
+        path: "../../lib/DeFiBlocks/cadence/contracts/interfaces/DFB.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "SwapStack",
-        path: "../../DeFiBlocks/cadence/contracts/connectors/SwapStack.cdc",
+        path: "../../lib/DeFiBlocks/cadence/contracts/connectors/SwapStack.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "FungibleTokenStack",
-        path: "../../DeFiBlocks/cadence/contracts/connectors/FungibleTokenStack.cdc",
+        path: "../../lib/DeFiBlocks/cadence/contracts/connectors/FungibleTokenStack.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
@@ -54,13 +54,13 @@ access(all) fun deployContracts() {
     let initialMoetSupply = 0.0
     err = Test.deployContract(
         name: "MOET",
-        path: "../contracts/internal-dependencies/tokens/MOET.cdc",
+        path: "../../lib/TidalProtocol/cadence/contracts/MOET.cdc",
         arguments: [initialMoetSupply]
     )
     Test.expect(err, Test.beNil())
     err = Test.deployContract(
         name: "TidalProtocol",
-        path: "../contracts/internal-dependencies/TidalProtocol.cdc",
+        path: "../../lib/TidalProtocol/cadence/contracts/TidalProtocol.cdc",
         arguments: []
     )
     Test.expect(err, Test.beNil())
@@ -69,7 +69,7 @@ access(all) fun deployContracts() {
     let initialYieldSupply = 0.0
     err = Test.deployContract(
         name: "YieldToken",
-        path: "../contracts/internal-dependencies/tokens/YieldToken.cdc",
+        path: "../contracts/mocks/YieldToken.cdc",
         arguments: [initialYieldSupply]
     )
     Test.expect(err, Test.beNil())

flow.json

@@ -1,28 +1,28 @@
 {
 	"contracts": {
 		"DFB": {
-			"source": "./DeFiBlocks/cadence/contracts/interfaces/DFB.cdc",
+			"source": "./lib/DeFiBlocks/cadence/contracts/interfaces/DFB.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
 			}
 		},
 		"DFBUtils": {
-			"source": "./DeFiBlocks/cadence/contracts/utils/DFBUtils.cdc",
+			"source": "./lib/DeFiBlocks/cadence/contracts/utils/DFBUtils.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
 			}
 		},
 		"FungibleTokenStack": {
-			"source": "./DeFiBlocks/cadence/contracts/connectors/FungibleTokenStack.cdc",
+			"source": "./lib/DeFiBlocks/cadence/contracts/connectors/FungibleTokenStack.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
 			}
 		},
 		"MOET": {
-			"source": "cadence/contracts/internal-dependencies/tokens/MOET.cdc",
+			"source": "./lib/TidalProtocol/cadence/contracts/MOET.cdc",
 			"aliases": {
 				"testing": "0000000000000008"
 			}
@@ -56,14 +56,14 @@
 			}
 		},
 		"SwapStack": {
-			"source": "./DeFiBlocks/cadence/contracts/connectors/SwapStack.cdc",
+			"source": "./lib/DeFiBlocks/cadence/contracts/connectors/SwapStack.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000007"
 			}
 		},
 		"TidalProtocol": {
-			"source": "cadence/contracts/internal-dependencies/TidalProtocol.cdc",
+			"source": "./lib/TidalProtocol/cadence/contracts/TidalProtocol.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000008"
@@ -91,7 +91,7 @@
 			}
 		},
 		"YieldToken": {
-			"source": "cadence/contracts/internal-dependencies/tokens/YieldToken.cdc",
+			"source": "cadence/contracts/mocks/YieldToken.cdc",
 			"aliases": {
 				"emulator": "f8d6e0586b0a20c7",
 				"testing": "0000000000000010"